diff --git a/lib/set_parser.cpp b/lib/set_parser.cpp
index b238946f5..1fff9f6d2 100644
--- a/lib/set_parser.cpp
+++ b/lib/set_parser.cpp
@@ -44,7 +44,8 @@ std::map<std::string,std::vector<std::string>> SetParser::parse1() {
 #define VAR_VALUE_P1_3 "|(?:[\\w]+=(?:on|off)|,)+"
 #define VAR_VALUE_P1_4 "|(?:[@\\w/\\d:\\+\\-]|,)+"
 #define VAR_VALUE_P1_5 "|(?:(?:'{1}|\"{1})(?:)(?:'{1}|\"{1}))"
-#define VAR_VALUE_P1 "(" VAR_VALUE_P1_1 VAR_VALUE_P1_2 VAR_VALUE_P1_3 VAR_VALUE_P1_4 VAR_VALUE_P1_5 ")"
+#define VAR_VALUE_P1_6 "|(?: )+"
+#define VAR_VALUE_P1 "(" VAR_VALUE_P1_1 VAR_VALUE_P1_2 VAR_VALUE_P1_3 VAR_VALUE_P1_4 VAR_VALUE_P1_5 VAR_VALUE_P1_6 ")"
 
 	const std::string pattern="(?:" NAMES SPACES QUOTES NAME_VALUE QUOTES "(?: +COLLATE +" QUOTES NAME_VALUE QUOTES "|)" "|" SESSION_P1 VAR_P1 SPACES "(?:|:)=" SPACES QUOTES VAR_VALUE_P1 QUOTES ") *,? *";
 VALGRIND_DISABLE_ERROR_REPORTING;