Fix issue #19 and #21