Fix for CRAFTERCMS-574.