Fixed CommandListener