Add fix address lookup