BBY - Bug fixing - performance popup issue