diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 2310666289..51b6acec0b 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -1946,6 +1946,16 @@ SWITCH_STANDARD_API(cond_function)
 		}
 	}
 
+	if (strspn(a, "!<>=")) {
+		expr = a;
+	}
+
+	if (expr == a) {
+		a = "";
+	}
+
+	while (*expr == ' ') expr++;
+
 	while(expr && *expr) {
 		switch(*expr) {
 		case '!':