issue #19 & #20