diff --git a/src/homogenization.f90 b/src/homogenization.f90
index 3fadf1e96..0d62f83c7 100644
--- a/src/homogenization.f90
+++ b/src/homogenization.f90
@@ -297,7 +297,7 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE
         do co = 1, homogenization_Nconstituents(ho)
           ph = material_phaseAt(co,el)
           if (.not. thermal_stress(dt,ph,material_phaseMemberAt(co,ip,el))) then
-            if (.not. terminallyIll) &                                                           ! so first signals terminally ill...
+            if (.not. terminallyIll) &                                                              ! so first signals terminally ill...
               print*, ' Integration point ', ip,' at element ', el, ' terminally ill'
             terminallyIll = .true.                                                                  ! ...and kills all others
           endif
diff --git a/src/material.f90 b/src/material.f90
index 6575872ed..5802ab3c8 100644
--- a/src/material.f90
+++ b/src/material.f90
@@ -29,13 +29,13 @@ module material
   integer, dimension(:),     allocatable, public, protected :: &                                    ! (elem)
     material_homogenizationAt, &                                                                    !< homogenization ID of each element
     material_homogenizationID, &                                                                    !< per cell
-    material_homogenizationEntry                                                                    !< cell
+    material_homogenizationEntry                                                                    !< per cell
   integer, dimension(:,:),   allocatable :: &                                                       ! (ip,elem)
     material_homogenizationMemberAt                                                                 !< position of the element within its homogenization instance
   integer, dimension(:,:),   allocatable, public, protected :: &                                    ! (constituent,elem)
     material_phaseAt, &                                                                             !< phase ID of each element
-    material_phaseID, &                                                                             !< per constituent,cell
-    material_phaseEntry                                                                             !< per constituent, cell
+    material_phaseID, &                                                                             !< per (constituent,cell)
+    material_phaseEntry                                                                             !< per (constituent,cell
   integer, dimension(:,:,:), allocatable, public, protected :: &                                    ! (constituent,IP,elem)
     material_phaseMemberAt                                                                          !< position of the element within its phase instance
 
diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90
index 6bcfc9a75..83a5082f8 100644
--- a/src/phase_mechanical.f90
+++ b/src/phase_mechanical.f90
@@ -226,10 +226,10 @@ module subroutine mechanical_init(materials,phases)
   allocate(phase_mechanical_P(phases%length))
   allocate(phase_mechanical_S0(phases%length))
 
-  allocate(material_orientation0(homogenization_maxNconstituents,phases%length,maxVal(material_phaseMemberAt)))
+  allocate(material_orientation0(homogenization_maxNconstituents,phases%length,maxVal(material_phaseEntry)))
 
   do ph = 1, phases%length
-    Nmembers = count(material_phaseAt == ph) * discretization_nIPs
+    Nmembers = count(material_phaseID == ph)
 
     allocate(phase_mechanical_Fi(ph)%data(3,3,Nmembers))
     allocate(phase_mechanical_Fe(ph)%data(3,3,Nmembers))