Fix for item #6 (CRAFTERCMS-465)