diff --git a/quickjs.c b/quickjs.c
index 84c444800..009748bb3 100644
--- a/quickjs.c
+++ b/quickjs.c
@@ -20811,7 +20811,7 @@ static int __exception js_parse_property_name(JSParseState *s,
                 goto fail1;
             if (s->token.val == ':' || s->token.val == ',' ||
                 s->token.val == '}' || s->token.val == '(' ||
-                s->token.val == '=' ) {
+                s->token.val == '=') {
                 is_non_reserved_ident = TRUE;
                 goto ident_found;
             }
@@ -20827,7 +20827,8 @@ static int __exception js_parse_property_name(JSParseState *s,
             if (next_token(s))
                 goto fail1;
             if (s->token.val == ':' || s->token.val == ',' ||
-                s->token.val == '}' || s->token.val == '(') {
+                s->token.val == '}' || s->token.val == '(' ||
+                s->token.val == '=') {
                 is_non_reserved_ident = TRUE;
                 goto ident_found;
             }
@@ -21583,7 +21584,12 @@ static __exception int js_parse_class(JSParseState *s, BOOL is_class_expr,
                 goto fail;
             continue;
         }
-        is_static = (s->token.val == TOK_STATIC);
+        is_static = FALSE;
+        if (s->token.val == TOK_STATIC) {
+            int next = peek_token(s, TRUE);
+            if (!(next == ';' || next == '}' || next == '(' || next == '='))
+                is_static = TRUE;
+        }
         prop_type = -1;
         if (is_static) {
             if (next_token(s))
diff --git a/tests/test_language.js b/tests/test_language.js
index 083ae4303..af219b04a 100644
--- a/tests/test_language.js
+++ b/tests/test_language.js
@@ -336,10 +336,13 @@ function test_class()
     assert(S.x === 42);
     assert(S.y === 42);
     assert(S.z === 42);
+    
     class P {
-        get = () => "123"
+        get = () => "123";
+        static() { return 42; }
     }
     assert(new P().get() === "123");
+    assert(new P().static() === 42);
 };
 
 function test_template()