CRAFTERCMS-489: Fixing issues related with this change