Fix issue #2
Fix issue #3
Fix fix issue #2