Fix for CRAFTCONO-27