Commands System Hotfix