Fix for CRAFTERCMS-522