Issue #1 solved