fixing address gen