fixing #19 and #20