diff --git a/Inst_eddies/set_contours.f90 b/Inst_eddies/set_contours.f90
index edd2303835ad7a32be4702c2a26a0a3d7a631a98..ec392569443198d460732a32166ad8fb28b40ac4 100644
--- a/Inst_eddies/set_contours.f90
+++ b/Inst_eddies/set_contours.f90
@@ -60,8 +60,9 @@ contains
     integer llc(2) ! indices in grid of lower left corner
     integer urc(2) ! indices in grid of upper right corner
 
-    real corner_window(2) ! longitude and latitude of the window
-    ! around each extremum, in rad
+    integer corner_window(2)
+    ! coordinates in projection space of corner of the window around
+    ! each extremum
 
     integer, parameter:: n_max_cont = 31 ! must be >= 3
 
@@ -103,8 +104,9 @@ contains
        ! assert n_cont >= 1
        ! {begin} Restrict the field to the outermost contour:
 
+       corner_window = floor(minval(cont_list_proj(n_cont)%points, dim = 2))
        llc = nint((corner_whole - corner) / step) &
-            + floor(minval(cont_list_proj(n_cont)%points, dim = 2))
+            + corner_window
        urc = nint((corner_whole - corner) / step) &
             + ceiling(maxval(cont_list_proj(n_cont)%points, dim = 2))
 
@@ -112,16 +114,13 @@ contains
        urc(2) = min(urc(2), size(ssh, 2))
        urc(1) = min(urc(1), size(ssh, 1))
 
-       corner_window = corner + (llc - 1) * step
-
        ! {end} Done restricting field
 
        call set_max_speed(speed_cont, max_speed, cont_list, cont_list_proj, &
             n_cont, extr%coord, real(extr%coord_proj), &
             ssh(llc(1):urc(1), llc(2):urc(2)), &
-            u(llc(1):urc(1), llc(2):urc(2)), &
-            v(llc(1):urc(1), llc(2):urc(2)), &
-            (corner_window - corner_whole) / step + 1., step)
+            u(llc(1):urc(1), llc(2):urc(2)), v(llc(1):urc(1), llc(2):urc(2)), &
+            real(corner_window), step)
     end if
 
   end subroutine set_contours