Kuan fixed bugs - 2612, 2448, 2628