issue #20 and issue #19