Fixed bug CHOT-77