Fix for CRAFTERCMS-661.
Merge pull request #123 from avasquez614/master

Fix for CRAFTERCMS-661