Fixed bug BLUEBOX-476