fixing #20