Fixed bugs 2608, 2609, 2610, 2625, 2627