diff --git a/tools/ges-structure-parser.c b/tools/ges-structure-parser.c
index aa5fe3a66e..6f6dcd870e 100644
--- a/tools/ges-structure-parser.c
+++ b/tools/ges-structure-parser.c
@@ -113,6 +113,8 @@ ges_structure_parser_parse_setter (GESStructureParser * self,
 {
   gchar *parsed_setter;
 
+  _finish_structure (self);
+
   while (*setter == '-' || *setter == ' ')
     setter++;
 
diff --git a/tools/parse.l b/tools/parse.l
index dabae18fde..ab6bb50a36 100644
--- a/tools/parse.l
+++ b/tools/parse.l
@@ -14,7 +14,7 @@ CLIP 		[ ]+--clip[ ]+|[ ]+-c[ ]+
 TRANSITION	[ ]+--transition[ ]+|[ ]+-t[ ]+
 EFFECT		[ ]+--effect[ ]+|[ ]+-e[ ]+
 
-SETTER		[ ]+--set-.[ ]+
+SETTER		[ ]+--set-[^ ]+[ ]+
 
 %%