diff --git a/src/homogenization_damage_pass.f90 b/src/homogenization_damage_pass.f90
index 6d0f3e2c4..b9c4e2062 100644
--- a/src/homogenization_damage_pass.f90
+++ b/src/homogenization_damage_pass.f90
@@ -17,8 +17,8 @@ module subroutine pass_init()
 
     if (.not. damage_active(ho)) cycle
 
-  if (homogenization_Nconstituents(1) /= 1) & !ToDo: needs extension to multiple homogenizations
-    call IO_error(211,ext_msg='(pass) with N_constituents !=1')
+    if (homogenization_Nconstituents(ho) /= 1) &
+      call IO_error(211,ext_msg='(pass) with N_constituents !=1')
   end do
 
 end subroutine pass_init
diff --git a/src/homogenization_thermal_pass.f90 b/src/homogenization_thermal_pass.f90
index 33060f9be..6cd895aed 100644
--- a/src/homogenization_thermal_pass.f90
+++ b/src/homogenization_thermal_pass.f90
@@ -17,7 +17,7 @@ module subroutine pass_init()
 
     if (thermal_type(ho) /= THERMAL_PASS_ID) cycle
 
-    if (homogenization_Nconstituents(1) /= 1) & !ToDo: needs extension to multiple homogenizations
+    if (homogenization_Nconstituents(ho) /= 1) &
       call IO_error(211,ext_msg='(pass) with N_constituents !=1')
 
   end do