Fix command definition collision between hat '^' and underscore '_'
Merge pull request #686 from diwo/fix-hat-wrong-command

Fix command definition collision between hat '^' and underscore '_'