Fix issue #2
Fix issue #1