Fix for CRAFTERCMS-506