Fix for bug CREAM-138