Encounter address fix