diff --git a/WW3/CMakeLists.txt b/WW3/CMakeLists.txt
index 3d957d8..dd33bf9 100644
--- a/WW3/CMakeLists.txt
+++ b/WW3/CMakeLists.txt
@@ -87,12 +87,13 @@ target_sources(OM3_ww3 PRIVATE
   WW3/model/src/wav_kind_mod.F90
   WW3/model/src/wav_shr_mod.F90
   WW3/model/src/wav_shel_inp.F90
-  WW3/model/src/wav_comp_nuopc.F90
   WW3/model/src/wav_import_export.F90
 
   ${switch_files}
 )
 
+add_patched_source(OM3_ww3 WW3/model/src/wav_comp_nuopc.F90)
+
 ## Utilities
 
 # ww3_grid
diff --git a/WW3/patches/wav_comp_nuopc.F90.patch b/WW3/patches/wav_comp_nuopc.F90.patch
new file mode 100644
index 0000000..ed0d420
--- /dev/null
+++ b/WW3/patches/wav_comp_nuopc.F90.patch
@@ -0,0 +1,13 @@
+diff --git a/model/src/wav_comp_nuopc.F90 b/model/src/wav_comp_nuopc.F90
+index 8b9ff5a5..eabdb47f 100644
+--- a/model/src/wav_comp_nuopc.F90
++++ b/model/src/wav_comp_nuopc.F90
+@@ -608,7 +608,7 @@ contains
+       if (ChkErr(rc,__LINE__,u_FILE_u)) return
+     endif
+     ! Determine time attributes for history output
+-    call ESMF_TimeGet( esmfTime, timeString=time_origin, calendar=calendar, rc=rc )
++    call ESMF_TimeGet( startTime, timeString=time_origin, calendar=calendar, rc=rc )
+     if (ChkErr(rc,__LINE__,u_FILE_u)) return
+     time_origin = 'seconds since '//time_origin(1:10)//' '//time_origin(12:19)
+     !call ESMF_ClockGet(clock, calendar=calendar)