Resolving Issue #1