Fix for bug CREAM-145