Fix for CRAFTERCMS-661.