diff --git a/src/scf_utils/roothaan_hall_scf.irp.f b/src/scf_utils/roothaan_hall_scf.irp.f
index faf23a51..91c85f5e 100644
--- a/src/scf_utils/roothaan_hall_scf.irp.f
+++ b/src/scf_utils/roothaan_hall_scf.irp.f
@@ -208,8 +208,8 @@ END_DOC
   do j=1,dim_DIIS
     do i=1,dim_DIIS
 
-      j_DIIS = mod(iteration_SCF-j,max_dim_DIIS)+1
-      i_DIIS = mod(iteration_SCF-i,max_dim_DIIS)+1
+      j_DIIS = min(mod(iteration_SCF-j,max_dim_DIIS)+1,dim_DIIS)
+      i_DIIS = min(mod(iteration_SCF-i,max_dim_DIIS)+1,dim_DIIS)
 
 ! Compute product of two errors vectors