Possibly partially fix CRAFTCONO-47