fixed bug #2085