diff --git a/test/autotests/render/error-class-tag-nested/expected.html b/test/autotests/render/error-class-tag-nested/expected.html
new file mode 100644
index 000000000..187c96a9b
--- /dev/null
+++ b/test/autotests/render/error-class-tag-nested/expected.html
@@ -0,0 +1 @@
+<button class="btn active btn-bar">Click me</button>
diff --git a/test/autotests/render/error-class-tag-nested/template.marko b/test/autotests/render/error-class-tag-nested/template.marko
new file mode 100644
index 000000000..31b283173
--- /dev/null
+++ b/test/autotests/render/error-class-tag-nested/template.marko
@@ -0,0 +1,3 @@
+<div>
+    <class>CLASS</class>
+</div>
\ No newline at end of file
diff --git a/test/autotests/render/error-class-tag-nested/test.js b/test/autotests/render/error-class-tag-nested/test.js
new file mode 100644
index 000000000..5ca4514d1
--- /dev/null
+++ b/test/autotests/render/error-class-tag-nested/test.js
@@ -0,0 +1,8 @@
+var expect = require('chai').expect;
+
+exports.templateData = {};
+
+exports.checkError = function(e) {
+    var message = e.toString();
+    expect(message).to.contain('class is a static tag and can only be declared at the template root');
+};
diff --git a/test/autotests/widgets-browser/class-named/index.marko b/test/autotests/widgets-browser/class-named/index.marko
new file mode 100644
index 000000000..1651f271d
--- /dev/null
+++ b/test/autotests/widgets-browser/class-named/index.marko
@@ -0,0 +1,12 @@
+class MyComponent {
+    onMount() {
+
+    }
+
+    sayHello(name) {
+        return 'Hello ' + name + '!';
+    }
+}
+
+<div.root>
+</div>
\ No newline at end of file
diff --git a/test/autotests/widgets-browser/class-named/test.js b/test/autotests/widgets-browser/class-named/test.js
new file mode 100644
index 000000000..ece1c4b3f
--- /dev/null
+++ b/test/autotests/widgets-browser/class-named/test.js
@@ -0,0 +1,7 @@
+var expect = require('chai').expect;
+
+module.exports = function(helpers) {
+    var widget = helpers.mount(require('./index'), { });
+
+    expect(widget.sayHello('Frank')).to.equal('Hello Frank!');
+};
\ No newline at end of file
diff --git a/widgets/taglib/TransformHelper/handleRootNodes.js b/widgets/taglib/TransformHelper/handleRootNodes.js
index b1082cb52..689d96632 100644
--- a/widgets/taglib/TransformHelper/handleRootNodes.js
+++ b/widgets/taglib/TransformHelper/handleRootNodes.js
@@ -183,8 +183,6 @@ function classToObject(cls, transformHelper) {
 }
 
 function handleClassDeclaration(classEl, transformHelper) {
-    if(!/^class\s*\{/.test(classEl.tagString)) return;
-
     let tree;
     var wrappedSrc = '('+classEl.tagString+'\n)';