issue #10 #11 fixed