Fix issue #19
Fix issue #20