Screwed up on the cmd mode disable. Fixes #1