Command loop hotfix