fixed bug #2608