Hotfix on commands