1888,1889c1888,1889
< 	if (!ast_strlen_zero(qe->chan->macrocontext))
< 		ast_copy_string(tmp->chan->dialcontext, qe->chan->macrocontext, sizeof(tmp->chan->dialcontext));
---
> 	if (!ast_strlen_zero(pbx_builtin_getvar_helper(qe->chan, "MACRO_CONTEXT")))
> 		ast_copy_string(tmp->chan->dialcontext, pbx_builtin_getvar_helper(qe->chan, "MACRO_CONTEXT"), sizeof(tmp->chan->dialcontext));
1892,1893c1892,1893
< 	if (!ast_strlen_zero(qe->chan->macroexten))
< 		ast_copy_string(tmp->chan->exten, qe->chan->macroexten, sizeof(tmp->chan->exten));
---
> 	if (!ast_strlen_zero(pbx_builtin_getvar_helper(qe->chan, "MACRO_EXTEN")))
> 		ast_copy_string(tmp->chan->exten, pbx_builtin_getvar_helper(qe->chan, "MACRO_EXTEN"), sizeof(tmp->chan->exten));