Finished fix for CRAFTERCMS-764.
Merge pull request #24 from avasquez614/2.4.x

Finished fix for CRAFTERCMS-764.