Fix run of command with context