fixed bug #31