Fixes CRAFTERCMS-845