Kuan Fixed bugs - 2617, 2534, 2616