Hotfix: Bad command execution