Address fixing