fix address lookup?