CRAFTERCMS-140: Fixed this issue