diff --git a/CombineAIDriver.lua b/CombineAIDriver.lua
index d6493372b..04bbb8000 100644
--- a/CombineAIDriver.lua
+++ b/CombineAIDriver.lua
@@ -182,6 +182,7 @@ function CombineAIDriver:start(startingPoint)
 	local total, pipeInFruit = self.fieldworkCourse:setPipeInFruitMap(self.pipeOffsetX, self.vehicle.cp.workWidth)
 	local ix = self.fieldworkCourse:getStartingWaypointIx(AIDriverUtil.getDirectionNode(self.vehicle), startingPoint)
 	self:shouldStrawSwathBeOn(ix)
+	self.fillLevelFullPercentage = self.normalFillLevelFullPercentage
 	self:debug('Pipe in fruit map created, there are %d non-headland waypoints, of which at %d the pipe will be in the fruit',
 			total, pipeInFruit)
 end
@@ -247,8 +248,6 @@ function CombineAIDriver:onWaypointPassed(ix)
 	-- harvesting fruit while making the pocket unless we have self unload turned on
 	if self:shouldMakePocket() and self.vehicle.cp.settings.selfUnload:is(false) then
 		self.fillLevelFullPercentage = self.pocketFillLevelFullPercentage
-	else
-		self.fillLevelFullPercentage = self.normalFillLevelFullPercentage
 	end
 
 	self:shouldStrawSwathBeOn(ix)
diff --git a/course-generator/HybridAStar.lua b/course-generator/HybridAStar.lua
index 7a8a15807..456352aa2 100644
--- a/course-generator/HybridAStar.lua
+++ b/course-generator/HybridAStar.lua
@@ -755,6 +755,9 @@ function HybridAStarWithAStarInTheMiddle:resume(...)
 					self.allHybridRetries = self.allHybridRetries + 1
 					self.constraints:relaxConstraints()
 					return self:findHybridStartToEnd()
+				else
+					self:debug('all hybrid: we already tried with relaxed constraints, this did not work out')
+					return true, nil, goalNodeInvalid
 				end
 			end
 		elseif self.phase == self.MIDDLE then
diff --git a/modDesc.xml b/modDesc.xml
index 6090d397a..d9f3990aa 100644
--- a/modDesc.xml
+++ b/modDesc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <modDesc descVersion="47">
-	<version>6.03.00021</version>
+	<version>6.03.00022</version>
 	<author><![CDATA[Courseplay.devTeam]]></author>
 	<title><!-- en=English de=German fr=French es=Spanish ru=Russian pl=Polish it=Italian br=Brazilian-Portuguese cs=Chinese(Simplified) ct=Chinese(Traditional) cz=Czech nl=Netherlands hu=Hungary jp=Japanese kr=Korean pt=Portuguese ro=Romanian tr=Turkish -->
 		<en>CoursePlay SIX</en>