Fixed Command System. Solves ISSUE-9