diff --git a/src/determinants/spindeterminants.irp.f b/src/determinants/spindeterminants.irp.f
index 8ba405e0..765ee394 100644
--- a/src/determinants/spindeterminants.irp.f
+++ b/src/determinants/spindeterminants.irp.f
@@ -1193,16 +1193,10 @@ subroutine get_all_spin_singles_and_doubles_$N_int(buffer, idx, spindet, size_bu
       xorvec(k) = xor( spindet(k), buffer(k,i) )
     enddo
 
-    if (xorvec(1) /= 0_8) then
-      degree = popcnt(xorvec(1))
-    else
-      degree = 0
-    endif
+    degree = 0
 
-    do k=2,$N_int
-      if ( (degree <= 4).and.(xorvec(k) /= 0_8) ) then
+    do k=1,$N_int
         degree = degree + popcnt(xorvec(k))
-      endif
     enddo
 
     if ( degree == 4 ) then
@@ -1247,23 +1241,19 @@ subroutine get_all_spin_singles_$N_int(buffer, idx, spindet, size_buffer, single
       xorvec(k) = xor( spindet(k), buffer(k,i) )
     enddo
 
-    if (xorvec(1) /= 0_8) then
-      degree = popcnt(xorvec(1))
-    else
-      degree = 0
-    endif
+    degree = 0
 
-    do k=2,$N_int
-      if ( (degree <= 2).and.(xorvec(k) /= 0_8) ) then
+    do k=1,$N_int
         degree = degree + popcnt(xorvec(k))
-      endif
     enddo
 
-    if ( degree == 2 ) then
-      singles(n_singles) = idx(i)
-      n_singles = n_singles+1
+    if ( degree /= 2 ) then
+      cycle
     endif
 
+    singles(n_singles) = idx(i)
+    n_singles = n_singles+1
+
   enddo
   n_singles = n_singles-1
 
@@ -1296,23 +1286,19 @@ subroutine get_all_spin_doubles_$N_int(buffer, idx, spindet, size_buffer, double
       xorvec(k) = xor( spindet(k), buffer(k,i) )
     enddo
 
-    if (xorvec(1) /= 0_8) then
-      degree = popcnt(xorvec(1))
-    else
-      degree = 0
-    endif
+    degree = 0
 
-    do k=2,$N_int
-      if ( (degree <= 4).and.(xorvec(k) /= 0_8) ) then
+    do k=1,$N_int
         degree = degree + popcnt(xorvec(k))
-      endif
     enddo
 
-    if ( degree == 4 ) then
-      doubles(n_doubles) = idx(i)
-      n_doubles = n_doubles+1
+    if ( degree /= 4 ) then
+      cycle
     endif
 
+    doubles(n_doubles) = idx(i)
+    n_doubles = n_doubles+1
+
   enddo
 
   n_doubles = n_doubles-1