Fix for CRAFTERCMS-863.