Fixed the commands bug