Fix for CRAFTERCMS-859.
Merge pull request #18 from avasquez614/2.2.x

Fix for CRAFTERCMS-859.