Bugfix: Fix RemoveCommand