fixed bug #20