diff --git a/src/phase.f90 b/src/phase.f90
index d872d8115..cb5845318 100644
--- a/src/phase.f90
+++ b/src/phase.f90
@@ -103,6 +103,9 @@ module phase
     module subroutine mechanical_forward()
     end subroutine mechanical_forward
 
+    module subroutine damage_forward()
+    end subroutine damage_forward
+
     module subroutine thermal_forward()
     end subroutine thermal_forward
 
@@ -429,21 +432,13 @@ end subroutine phase_restore
 
 !--------------------------------------------------------------------------------------------------
 !> @brief Forward data after successful increment.
-! ToDo: Any guessing for the current states possible?
 !--------------------------------------------------------------------------------------------------
 subroutine phase_forward()
 
-  integer :: ph
-
-
   call mechanical_forward()
+  call damage_forward()
   call thermal_forward()
 
-  do ph = 1, size(damageState)
-    if (damageState(ph)%sizeState > 0) &
-      damageState(ph)%state0 = damageState(ph)%state
-  enddo
-
 end subroutine phase_forward
 
 
diff --git a/src/phase_damage.f90 b/src/phase_damage.f90
index c6b430b74..9659e5fea 100644
--- a/src/phase_damage.f90
+++ b/src/phase_damage.f90
@@ -503,4 +503,21 @@ module function damage_phi(ph,me) result(phi)
 end function damage_phi
 
 
+
+!--------------------------------------------------------------------------------------------------
+!> @brief Forward data after successful increment.
+!--------------------------------------------------------------------------------------------------
+module subroutine damage_forward()
+
+  integer :: ph
+
+
+  do ph = 1, size(damageState)
+    if (damageState(ph)%sizeState > 0) &
+      damageState(ph)%state0 = damageState(ph)%state
+  enddo
+
+end subroutine damage_forward
+
+
 end submodule damagee