diff --git a/Inst_eddies/Tests/examine_eddy.f90 b/Inst_eddies/Tests/examine_eddy.f90
index 71339e60d69bead2a093132f6059a92c3169acbc..9032505ba34b1d3a67e7e4207d3bf28ba4eb888b 100644
--- a/Inst_eddies/Tests/examine_eddy.f90
+++ b/Inst_eddies/Tests/examine_eddy.f90
@@ -173,9 +173,9 @@ program examine_eddy
   end do
 
   n2 = count(in_window)
-  call set_all_extr(s, step, periodic = .false., &
-       ssh = ssh(llc(1):urc(1), llc(2):urc(2)), corner = corner_window)
-  selection = pack(s%extr_map, s%extr_map /= 0)
+  call set_all_extr(s, step, periodic, ssh, corner)
+  selection = pack(s%extr_map(llc(1):urc(1), llc(2):urc(2)), &
+       s%extr_map(llc(1):urc(1), llc(2):urc(2)) /= 0)
   selection = pack(selection, s%list(selection)%cyclone .neqv. cyclone)
   n1 = size(selection)
   allocate(outside_points(2, n1 + n2))
@@ -189,8 +189,7 @@ program examine_eddy
      end if
   end do
 
-  i = s%extr_map(e%extr%coord_proj(1) - llc(1) + 1, &
-       e%extr%coord_proj(2) - llc(2) + 1)
+  i = s%extr_map(e%extr%coord_proj(1), e%extr%coord_proj(2))
   e%innermost_level = s%list(i)%innermost_level
   call create_cont_list
   call set_contours(e%out_cont, e%speed_cont, e%max_speed, cyclone, e%extr, &