Fixed bugs 2613, 2608, 2609, 2610, 2611