Resolve issues with the toggle command. Fixes #402