Small fix with command handling