Fixed Issue #1, #2