diff --git a/Inst_eddies/set_max_speed.F90 b/Inst_eddies/set_max_speed.F90
index 3109bbba4e9053b4832854869f3a6fbb6e7a9fd7..1a944cbba4b4971c27ca03b17e8d2b0e13f44015 100644
--- a/Inst_eddies/set_max_speed.F90
+++ b/Inst_eddies/set_max_speed.F90
@@ -92,15 +92,17 @@ contains
        ! All speed values are NaN
        e%speed_cont = null_ssh_contour()
        e%max_speed = missing_speed
-    else if (i == i_outer) then
-       ! Maximum speed on the outermost contour
-       e%speed_cont = null_ssh_contour()
-       e%max_speed = speed(i)
     else
-       e%speed_cont = cont_list(i)
-       e%speed_cont%area = spher_polyline_area(e%speed_cont%polyline)
-       call ccw_orient(e%speed_cont)
        e%max_speed = speed(i)
+
+       if (i == i_outer) then
+          ! Maximum speed on the outermost contour
+          e%speed_cont = null_ssh_contour()
+       else
+          e%speed_cont = cont_list(i)
+          e%speed_cont%area = spher_polyline_area(e%speed_cont%polyline)
+          call ccw_orient(e%speed_cont)
+       end if
     end if
 
   end subroutine set_max_speed