Fix CRAFTERCMS-560
See issue for further instructions
Merge pull request #9 from cortiz/2.2.x

Fix CRAFTERCMS-560