Fixed CommandItems failing.