                     {
                         valuesFunction = factoryFunctions[declarationName];
                         valuesObject = new valuesFunction();
-                        finalName = fixNames(declarationName);
-                        values[finalName] = valuesObject;
                     }
                     else
                     {
                         valuesFunction = factoryFunctions[declarationName];
                         valuesObject = new valuesFunction();
-                        var o:Object = values[declarationName];
-                        finalName = fixNames(declarationName);
+                    }
+                    if (isValidStaticMediaQuery(mq))
+                    {
+                        finalName = fixNames(declarationName, mq);
+                        o = values[finalName];
                         if (o == null)
                             values[finalName] = valuesObject;
                         else

                        }
                    }
                    */
                    var finalName:String;
                    var valuesFunction:Function;
                    var valuesObject:Object;

package org.apache.flex.core
{
	import flash.system.ApplicationDomain;
	import flash.utils.getDefinitionByName;
	import flash.utils.getQualifiedClassName;
	import flash.utils.getQualifiedSuperclassName;
	
	import org.apache.flex.events.EventDispatcher;
	import org.apache.flex.events.ValueChangeEvent;
	
	public class SimpleCSSValuesImpl extends EventDispatcher implements IValuesImpl
	{
