fix for bug CREAM-172