Fix for bug CREAM-157
Fix for bug CREAM-157