fix issue #2
fix issue #3