Fix Bug with -set command not resetting back to NORMAL mode