fixed cases where address is not correctly returned