Bug Fix

Fixed CRAFTERCMS-128