Fixed bug CREAM-82