Fix for CRAFTERCMS-859.