Fix for bug CREAM-126