Fixes CRAFTBOOK-3001