fix address assigment