Should fix issue #19 and #20