New fix for bug CREAM-126