Fix bug in command list