Fixed commandhandler passing invalid args