fix for issue CREAM-129