ISSUE #5 Resolved