Fixes CRAFTERCMS-791