diff --git a/src/crystallite.f90 b/src/crystallite.f90
index 64998794e..26607a381 100644
--- a/src/crystallite.f90
+++ b/src/crystallite.f90
@@ -1447,10 +1447,7 @@ subroutine integrateStateRKCK45
     residuum_source
 
 
-  call update_dotState(1.0_pReal)
-
   nonlocalBroken = .false.
-
   !$OMP PARALLEL DO PRIVATE(sizeDotState,p,c)
   do e = FEsolving_execElem(1),FEsolving_execElem(2)
     do i = FEsolving_execIP(1),FEsolving_execIP(2)
@@ -1459,6 +1456,19 @@ subroutine integrateStateRKCK45
 
           p = material_phaseAt(g,e); c = material_phaseMemberAt(g,i,e)
 
+          call constitutive_collectDotState(crystallite_S(1:3,1:3,g,i,e), &
+                                            crystallite_partionedF0, &
+                                            crystallite_Fi(1:3,1:3,g,i,e), &
+                                            crystallite_partionedFp0, &
+                                            crystallite_subdt(g,i,e), g,i,e)
+          crystallite_todo(g,i,e) = all(.not. IEEE_is_NaN(plasticState(p)%dotState(:,c)))
+          do s = 1, phase_Nsources(p)
+            crystallite_todo(g,i,e) = crystallite_todo(g,i,e) .and. all(.not. IEEE_is_NaN(sourceState(p)%p(s)%dotState(:,c)))
+          enddo
+          if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
+            nonlocalBroken = .true.
+          if(.not. crystallite_todo(g,i,e)) cycle
+
           do stage = 1,5
 
             plasticState(p)%RKCK45dotState(stage,:,c) = plasticState(p)%dotState(:,c)