fix for issue CREAM-128