diff --git a/source/EngineGpuKernels/MutationProcessor.cuh b/source/EngineGpuKernels/MutationProcessor.cuh
index bba027e46..c311316cc 100644
--- a/source/EngineGpuKernels/MutationProcessor.cuh
+++ b/source/EngineGpuKernels/MutationProcessor.cuh
@@ -142,8 +142,8 @@ __inline__ __device__ void MutationProcessor::checkMutationsForCell(SimulationDa
 {
     auto& constructor = cell->cellFunctionData.constructor;
     if (GenomeDecoder::containsSelfReplication(constructor)) {
-        auto numNodes = GenomeDecoder::getNumNodesRecursively(constructor.genome, constructor.genomeSize, false, true);
-        auto numNonSeparatedNodes = GenomeDecoder::getNumNodesRecursively(constructor.genome, constructor.genomeSize, false, false);
+        auto numNodes = GenomeDecoder::getNumNodesRecursively(constructor.genome, constructor.genomeSize, true, true);
+        auto numNonSeparatedNodes = GenomeDecoder::getNumNodesRecursively(constructor.genome, constructor.genomeSize, true, false);
         auto tooMuchSeparatedParts = numNodes > 2 * numNonSeparatedNodes;
         if (tooMuchSeparatedParts) {
             cell->livingState = LivingState_Dying;
diff --git a/source/Gui/InspectorWindow.cpp b/source/Gui/InspectorWindow.cpp
index 5ffa686d9..6ee34b9e2 100644
--- a/source/Gui/InspectorWindow.cpp
+++ b/source/Gui/InspectorWindow.cpp
@@ -423,7 +423,7 @@ void _InspectorWindow::processCellGenomeTab(Description& desc)
             if (ImGui::TreeNodeEx("Properties (principal genome part)", TreeNodeFlags)) {
 
                 auto genomeDesc = GenomeDescriptionService::get().convertBytesToDescription(desc.genome);
-                auto numBranches= genomeDesc.header.numBranches;
+                auto numBranches = genomeDesc.header.getNumBranches();
                 AlienImGui::InputInt(
                     AlienImGui::InputIntParameters()
                         .name("Number of branches")