diff --git a/CHANGELOG.md b/CHANGELOG.md
index e094e55d3f51..27407b592cb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 ### Fixed
-
+- Fixes #1064. This is bug has been in MAPL for a long time. It shows only when the user specifies a non-default duration, and the last step of the duration interval is written to a new, separate file
 ## [2.8.6] - 2021-09-13
 
 ### Added
diff --git a/gridcomps/History/MAPL_HistoryGridComp.F90 b/gridcomps/History/MAPL_HistoryGridComp.F90
index 5fe808d2e47a..2b599f0316f3 100644
--- a/gridcomps/History/MAPL_HistoryGridComp.F90
+++ b/gridcomps/History/MAPL_HistoryGridComp.F90
@@ -3460,13 +3460,6 @@ subroutine Run ( gc, import, export, clock, rc )
           _VERIFY(STATUS)
        endif
 
-       if( NewSeg .and. list(n)%unit /= 0 .and. list(n)%duration /= 0 ) then
-          if (list(n)%unit > 0 ) then
-             call FREE_FILE( list(n)%unit )
-          end if
-          list(n)%unit = 0
-       endif
-
    end do
 
    if(any(Writing)) call WRITE_PARALLEL("")
@@ -3647,6 +3640,13 @@ subroutine Run ( gc, import, export, clock, rc )
 
       endif OUTTIME
 
+      if( NewSeg .and. list(n)%unit /= 0 .and. list(n)%duration /= 0 ) then
+         if (list(n)%unit > 0 ) then
+            call FREE_FILE( list(n)%unit )
+         end if
+         list(n)%unit = 0
+       endif
+
    enddo POSTLOOP
 
    if (any(writing)) then