Fix for bug CREAM-157