         var fontStyle:String = getStyle("fontStyle");
         var bold:Boolean = fontWeight == "bold";
         var italic:Boolean = fontStyle == "italic";
-        var embeddedFont:EmbeddedFont =
-            getEmbeddedFont(fontName, bold, italic);
-        oldEmbeddedFontContext =
+        oldEmbeddedFontContext = (noEmbeddedFonts || !embeddedFontRegistry) ? 
+			null : 
             embeddedFontRegistry.getAssociatedModuleFactory(
-                embeddedFont, flexModuleFactory);             
+                fontName, bold, italic, this, flexModuleFactory);             
     }
     
     /**

        // Check if the module factory has changed.
        var bold:Boolean = fontWeight == "bold";
        var italic:Boolean = fontStyle == "italic";
        var embeddedFont:EmbeddedFont =
            getEmbeddedFont(fontName, bold, italic);
        var fontContext:IFlexModuleFactory =
            embeddedFontRegistry.getAssociatedModuleFactory(
                embeddedFont, flexModuleFactory)
        return fontContext != oldEmbeddedFontContext;
    }


     */
    private var hasFontContextBeenSaved:Boolean = false;
     
        
    /**
     *  @private
     * 
