Fix for bug CREAM-140