Kuan - Fixed bugs 2618, 2591, 2615, 2460, 2620