fix for issue CREAM-125