fixed bug #359