Fix for CRAFTERCMS-521