Really fix CRAFTCONO-27.