Address presentation fix