Fixed bug TOAS-181