fixed bug #37