Fixed a Bug with the address lookup