Issues #1 solved!