FORGE-1942: Fixed command execution out of context