fix bug #20