CRAFTERCMS-552: Fixed.
Merge pull request #8 from avasquez614/2.2.x

CRAFTERCMS-552: Fixed.