CommandMaps bug fix.