Fix for bugID CE-388