diff --git a/src/switch_channel.c b/src/switch_channel.c
index 213f385b28..9e76b46a5a 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -2907,14 +2907,15 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
 				}
 				p = e > endof_indup ? endof_indup : e;
 
-				if ((vval = strchr(vname, '('))) {
+				if ((vval = strchr(vname, '(')) || (vval = strchr(vname, ' '))) {
+					if (*vval == '(') br = 1;
 					e = vval - 1;
 					*vval++ = '\0';
 					while (*e == ' ') {
 						*e-- = '\0';
 					}
 					e = vval;
-					br = 1;
+
 					while (e && *e) {
 						if (*e == '(') {
 							br++;
diff --git a/src/switch_event.c b/src/switch_event.c
index 4b1e28aebf..f782c15900 100644
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -1644,14 +1644,15 @@ SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const
 				}
 				p = e > endof_indup ? endof_indup : e;
 
-				if ((vval = strchr(vname, '('))) {
+				if ((vval = strchr(vname, '(')) || (vval = strchr(vname, ' '))) {
+					if (*vval == '(') br = 1;
 					e = vval - 1;
 					*vval++ = '\0';
 					while (*e == ' ') {
 						*e-- = '\0';
 					}
 					e = vval;
-					br = 1;
+
 					while (e && *e) {
 						if (*e == '(') {
 							br++;