fix issue #11
fix issue #10