fix issue #3
fix issue #2