Fix for CRAFTERCMS-859.
Merge pull request #20 from avasquez614/2.4.x

Fix for CRAFTERCMS-859.