CRAFTERCMS-552: Fixed.