Bug Fix for CRAFTERCMS-210