Bug fix for Invalid Command