Fix bug in command que