Issue #1 resolved