fix issue #10
fix issue #11