diff --git a/.storybook/css/StoryStatic.tsx b/.storybook/css/StoryStatic.tsx
index f8b63bf03..74f3f0c1a 100644
--- a/.storybook/css/StoryStatic.tsx
+++ b/.storybook/css/StoryStatic.tsx
@@ -82,3 +82,12 @@ export class Button extends Component<any, any> {
         return <button>Hello world!</button>;
     }
 }
+
+/*@css
+export class Button extends Compnent<any, any> {
+    static css
+    render () {
+
+    }
+}
+*/
diff --git a/package.json b/package.json
index 632b6d4b9..8f042f389 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "freestyler",
-  "version": "1.6.0",
+  "version": "1.6.3",
   "description": "5th generation React styling library",
   "main": "lib/index.js",
   "module": "modules/index.js",
diff --git a/src/renderer/Renderer.ts b/src/renderer/Renderer.ts
index 53497a005..8ca915ec0 100644
--- a/src/renderer/Renderer.ts
+++ b/src/renderer/Renderer.ts
@@ -389,12 +389,14 @@ class Renderer implements IRenderer {
     }
 
     unrender(Comp, instance, el: HTMLElement | null) {
-        require('../debug').emit({
-            type: 'UNRENDER',
-            Comp,
-            instance,
-            el,
-        });
+        if (process.env.NODE_ENV !== 'production') {
+            require('../debug').emit({
+                type: 'UNRENDER',
+                Comp,
+                instance,
+                el,
+            });
+        }
 
         // Remove statics
         const cacheMap = instance[$$statics] as {[key: string]: DeclarationCache};
@@ -412,8 +414,8 @@ class Renderer implements IRenderer {
         if (dynamics) {
             dynamics.destroy();
             // TODO: Do we really need this line?
-            instance[$$dynamics] = null;
-            // delete instance[$$dynamics];
+            // instance[$$dynamics] = null;
+            delete instance[$$dynamics];
         }
     }
 
@@ -422,6 +424,8 @@ class Renderer implements IRenderer {
 
         if (classNames === void 0) {
             hidden(Comp, $$cn, '');
+        } else {
+            return classNames;
         }
 
         let styles = tplToStyles(tpl, args);