Fix for CRAFTERCMS-646