diff --git a/yaml.jsf b/yaml.jsf
index 7c5e8e7..317bf51 100644
--- a/yaml.jsf
+++ b/yaml.jsf
@@ -50,8 +50,8 @@
 :maybe_key1 Constant
 	*		idle		noeat
 	":"		key
-	" a-zA-Z0-9_-"	maybe_key1
-	"#"		maybe_idle_comment	noeat
+	"a-zA-Z0-9_-"	maybe_key1
+	" "		maybe_key1_comment
 
 # necessary to include the :
 :key Idle
@@ -68,6 +68,10 @@
 	*		plain_scalar	noeat
 	"#"		line_comment
 
+:maybe_key1_comment Comment
+	*		maybe_key1	noeat
+	"#"		line_comment
+
 :maybe_idle_comment Comment
 	*		idle		noeat
 	"#"		line_comment