Merge pull request #202 from eVoLuTiVeMEDIA/master

Fixed some "interferences" between fixed and user shortcuts.