fixed bug #1235