Fixed issue GDCCOE-630