CRAFTERCMS-489: Fixing issues related with this change
Merge pull request #66 from alvarog/master

CRAFTERCMS-489: Fixing issues related with this change