Resolve Issue #1 as FIXED