Really Fixed CommandManager this time...