Fixed issue with usage of context variables in command