Solves CRAFTERCMS-477