fix some cases where address is not found