Fix for BLUEBOX-476