fix for issue CREAM-123