diff --git a/src/constitutive.f90 b/src/constitutive.f90
index 0d8e35ba3..111e68fdf 100644
--- a/src/constitutive.f90
+++ b/src/constitutive.f90
@@ -369,7 +369,7 @@ module constitutive
 
     module subroutine constitutive_plastic_dependentState(co,ip,el)
       integer, intent(in) :: &
-        co, &                                                                                      !< component-ID of integration point
+        co, &                                                                                       !< component-ID of integration point
         ip, &                                                                                       !< integration point
         el                                                                                          !< element
     end subroutine constitutive_plastic_dependentState
@@ -390,7 +390,6 @@ module constitutive
     constitutive_forward, &
     constitutive_restore, &
     plastic_nonlocal_updateCompatibility, &
-    source_active, &
     kinematics_active, &
     converged, &
     crystallite_init, &
@@ -466,35 +465,7 @@ subroutine constitutive_init
 end subroutine constitutive_init
 
 
-!--------------------------------------------------------------------------------------------------
-!> @brief checks if a source mechanism is active or not
-!--------------------------------------------------------------------------------------------------
-function source_active(source_label,src_length)  result(active_source)
 
-  character(len=*), intent(in)         :: source_label                                              !< name of source mechanism
-  integer,          intent(in)         :: src_length                                                !< max. number of sources in system
-  logical, dimension(:,:), allocatable :: active_source
-
-  class(tNode), pointer :: &
-    phases, &
-    phase, &
-    sources, &
-    src
-  integer :: p,s
-
-  phases => config_material%get('phase')
-  allocate(active_source(src_length,phases%length), source = .false. )
-  do p = 1, phases%length
-    phase => phases%get(p)
-    sources => phase%get('source',defaultVal=emptyList)
-    do s = 1, sources%length
-      src => sources%get(s)
-      if(src%get_asString('type') == source_label) active_source(s,p) = .true.
-    enddo
-  enddo
-
-
-end function source_active
 
 
 !--------------------------------------------------------------------------------------------------
diff --git a/src/constitutive_damage.f90 b/src/constitutive_damage.f90
index 85500e260..8c9104946 100644
--- a/src/constitutive_damage.f90
+++ b/src/constitutive_damage.f90
@@ -453,4 +453,35 @@ function constitutive_damage_deltaState(Fe, co, ip, el, ph, of) result(broken)
 end function constitutive_damage_deltaState
 
 
+!--------------------------------------------------------------------------------------------------
+!> @brief checks if a source mechanism is active or not
+!--------------------------------------------------------------------------------------------------
+function source_active(source_label,src_length)  result(active_source)
+
+  character(len=*), intent(in)         :: source_label                                              !< name of source mechanism
+  integer,          intent(in)         :: src_length                                                !< max. number of sources in system
+  logical, dimension(:,:), allocatable :: active_source
+
+  class(tNode), pointer :: &
+    phases, &
+    phase, &
+    sources, &
+    src
+  integer :: p,s
+
+  phases => config_material%get('phase')
+  allocate(active_source(src_length,phases%length), source = .false. )
+  do p = 1, phases%length
+    phase => phases%get(p)
+    sources => phase%get('source',defaultVal=emptyList)
+    do s = 1, sources%length
+      src => sources%get(s)
+      if(src%get_asString('type') == source_label) active_source(s,p) = .true.
+    enddo
+  enddo
+
+
+end function source_active
+
+
 end submodule constitutive_damage
diff --git a/src/constitutive_thermal_dissipation.f90 b/src/constitutive_thermal_dissipation.f90
index 44227536c..f15d1cfe9 100644
--- a/src/constitutive_thermal_dissipation.f90
+++ b/src/constitutive_thermal_dissipation.f90
@@ -27,19 +27,20 @@ contains
 !--------------------------------------------------------------------------------------------------
 module function source_thermal_dissipation_init(source_length) result(mySources)
 
-  integer, intent(in)                  :: source_length  
+  integer, intent(in)                  :: source_length
   logical, dimension(:,:), allocatable :: mySources
 
   class(tNode), pointer :: &
     phases, &
     phase, &
-    sources, &
-    src 
+    sources, thermal, &
+    src
   integer :: Ninstances,sourceOffset,Nconstituents,p
 
-  print'(/,a)', ' <<<+-  source_thermal_dissipation init  -+>>>'
+  print'(/,a)', ' <<<+-  thermal_externalheat init  -+>>>'
+
+  mySources = thermal_active('dissipation',source_length)
 
-  mySources = source_active('thermal_dissipation',source_length)
   Ninstances = count(mySources)
   print'(a,i2)', ' # instances: ',Ninstances; flush(IO_STDOUT)
   if(Ninstances == 0) return
@@ -50,16 +51,17 @@ module function source_thermal_dissipation_init(source_length) result(mySources)
   allocate(source_thermal_dissipation_instance(phases%length), source=0)
 
   do p = 1, phases%length
-    phase => phases%get(p) 
-    if(count(mySources(:,p)) == 0) cycle
+    phase => phases%get(p)
     if(any(mySources(:,p))) source_thermal_dissipation_instance(p) = count(mySources(:,1:p))
-    sources => phase%get('source')
+    if(count(mySources(:,p)) == 0) cycle
+    thermal => phase%get('thermal')
+    sources => thermal%get('source')
     do sourceOffset = 1, sources%length
       if(mySources(sourceOffset,p)) then
         source_thermal_dissipation_offset(p) = sourceOffset
         associate(prm  => param(source_thermal_dissipation_instance(p)))
+        src => sources%get(sourceOffset)
 
-        src => sources%get(sourceOffset) 
         prm%kappa = src%get_asFloat('kappa')
         Nconstituents = count(material_phaseAt==p) * discretization_nIPs
         call constitutive_allocateState(thermalState(p)%p(sourceOffset),Nconstituents,0,0,0)
diff --git a/src/constitutive_thermal_externalheat.f90 b/src/constitutive_thermal_externalheat.f90
index de1617efa..2a3ec7362 100644
--- a/src/constitutive_thermal_externalheat.f90
+++ b/src/constitutive_thermal_externalheat.f90
@@ -41,7 +41,7 @@ module function source_thermal_externalheat_init(source_length) result(mySources
     src
   integer :: Ninstances,sourceOffset,Nconstituents,p
 
-  print'(/,a)', ' <<<+-  source_thermal_externalHeat init  -+>>>'
+  print'(/,a)', ' <<<+-  thermal_externalheat init  -+>>>'
 
   mySources = thermal_active('externalheat',source_length)
 
@@ -74,7 +74,6 @@ module function source_thermal_externalheat_init(source_length) result(mySources
         Nconstituents = count(material_phaseAt==p) * discretization_nIPs
         call constitutive_allocateState(thermalState(p)%p(sourceOffset),Nconstituents,1,1,0)
         end associate
-
       endif
     enddo
   enddo