Fixed CommandMap