Fixing address copy problem mentioned in #15