Fix a bug with finding addresses