Fix Issue #1
Fix Issue #2