Fixed bugs 2498, 2598, 2623, 2624 and 2626