Fixed bug CREAM-132 (part 1)