Fix for bug CREAM-139