diff --git a/source/glest_game/ai/path_finder.cpp b/source/glest_game/ai/path_finder.cpp
index 78e37a49..6ea38328 100644
--- a/source/glest_game/ai/path_finder.cpp
+++ b/source/glest_game/ai/path_finder.cpp
@@ -1,4 +1,3 @@
-// ==============================================================
 //	This file is part of Glest (www.glest.org)
 //
 //	Copyright (C) 2001-2008 Martio Figueroa
@@ -21,12 +20,14 @@
 #include "platform_common.h"
 #include "command.h"
 #include "faction.h"
+#include "randomgen.h"
 #include "leak_dumper.h"
 
 using namespace std;
 using namespace Shared::Graphics;
 using namespace Shared::Util;
 using namespace Shared::PlatformCommon;
+using Shared::Util::RandomGen;
 
 namespace Glest{ namespace Game{
 
@@ -36,10 +37,11 @@ namespace Glest{ namespace Game{
 
 // ===================== PUBLIC ======================== 
 
-const int PathFinder::maxFreeSearchRadius= 10;	
+const int PathFinder::maxFreeSearchRadius	= 10;
 //const int PathFinder::pathFindNodesMax= 400;
-const int PathFinder::pathFindNodesMax= 200;
-const int PathFinder::pathFindRefresh= 10;
+const int PathFinder::pathFindNodesMax		= 200;
+const int PathFinder::pathFindRefresh		= 10;
+const int PathFinder::pathFindBailoutRadius	= 20;
 
 
 PathFinder::PathFinder() {
@@ -195,22 +197,84 @@ TravelState PathFinder::findPath(Unit *unit, const Vec2i &finalPos, bool *wasStu
 				*wasStuck = true;
 			}
 			unit->setInBailOutAttempt(true);
-			// Try to bail out up to 20 cells away
-			for(int bailoutX = -20; bailoutX <= 20 && ts == tsBlocked; ++bailoutX) {
-				for(int bailoutY = -20; bailoutY <= 20 && ts == tsBlocked; ++bailoutY) {
-					const Vec2i newFinalPos = finalPos + Vec2i(bailoutX,bailoutY);
-					//if(map->canMove(unit, unit->getPos(), newFinalPos, &lookupCacheCanMove)) {
-					bool canUnitMove = map->canMove(unit, unit->getPos(), newFinalPos);
 
-					if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
-						char szBuf[4096]="";
-						sprintf(szBuf,"[attempting to BAIL OUT] finalPos [%s] newFinalPos [%s] ts [%d] canUnitMove [%d]",
-								finalPos.getString().c_str(),newFinalPos.getString().c_str(),ts,canUnitMove);
-						unit->logSynchData(__FILE__,__LINE__,szBuf);
+			//printf("#1 BAILOUT test unitid [%d]\n",unit->getId());
+
+			bool useBailoutRadius = true;
+			Command *command= unit->getCurrCommand();
+			if(command != NULL) {
+				const HarvestCommandType *hct= dynamic_cast<const HarvestCommandType*>(command->getCommandType());
+				if(hct != NULL) {
+					Resource *r = map->getSurfaceCell(Map::toSurfCoords(command->getPos()))->getResource();
+					if(r != NULL && r->getType() != NULL) {
+						Vec2i newFinalPos = unit->getFaction()->getClosestResourceTypeTargetFromCache(unit, r->getType());
+
+						//printf("#2 BAILOUT test unitid [%d] newFinalPos [%s] finalPos [%s]\n",unit->getId(),newFinalPos.getString().c_str(),finalPos.getString().c_str());
+
+						if(newFinalPos != finalPos) {
+							bool canUnitMove = map->canMove(unit, unit->getPos(), newFinalPos);
+
+							//printf("#3 BAILOUT test unitid [%d] newFinalPos [%s] finalPos [%s] canUnitMove [%d]\n",unit->getId(),newFinalPos.getString().c_str(),finalPos.getString().c_str(),canUnitMove);
+
+							if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
+								char szBuf[4096]="";
+								sprintf(szBuf,"[attempting to BAIL OUT] finalPos [%s] newFinalPos [%s] ts [%d] canUnitMove [%d]",
+										finalPos.getString().c_str(),newFinalPos.getString().c_str(),ts,canUnitMove);
+								unit->logSynchData(__FILE__,__LINE__,szBuf);
+							}
+
+							if(canUnitMove) {
+								useBailoutRadius = false;
+								ts= aStar(unit, newFinalPos, true);
+							}
+						}
 					}
+				}
+			}
 
-					if(canUnitMove) {
-						ts= aStar(unit, newFinalPos, true);
+			if(useBailoutRadius == true) {
+				//int tryRadius = random.randRange(-PathFinder::pathFindBailoutRadius, PathFinder::pathFindBailoutRadius);
+				int tryRadius = random.randRange(0,1);
+
+				//printf("#4 BAILOUT test unitid [%d] useBailoutRadius [%d] tryRadius [%d]\n",unit->getId(),useBailoutRadius,tryRadius);
+
+				// Try to bail out up to PathFinder::pathFindBailoutRadius cells away
+				if(tryRadius > 0) {
+					for(int bailoutX = -PathFinder::pathFindBailoutRadius; bailoutX >= PathFinder::pathFindBailoutRadius && ts == tsBlocked; ++bailoutX) {
+						for(int bailoutY = -PathFinder::pathFindBailoutRadius; bailoutY >= PathFinder::pathFindBailoutRadius && ts == tsBlocked; ++bailoutY) {
+							const Vec2i newFinalPos = finalPos + Vec2i(bailoutX,bailoutY);
+							bool canUnitMove = map->canMove(unit, unit->getPos(), newFinalPos);
+
+							if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
+								char szBuf[4096]="";
+								sprintf(szBuf,"[attempting to BAIL OUT] finalPos [%s] newFinalPos [%s] ts [%d] canUnitMove [%d]",
+										finalPos.getString().c_str(),newFinalPos.getString().c_str(),ts,canUnitMove);
+								unit->logSynchData(__FILE__,__LINE__,szBuf);
+							}
+
+							if(canUnitMove) {
+								ts= aStar(unit, newFinalPos, true);
+							}
+						}
+					}
+				}
+				else {
+					for(int bailoutX = PathFinder::pathFindBailoutRadius; bailoutX >= -tryRadius && ts == tsBlocked; --bailoutX) {
+						for(int bailoutY = PathFinder::pathFindBailoutRadius; bailoutY >= -PathFinder::pathFindBailoutRadius && ts == tsBlocked; --bailoutY) {
+							const Vec2i newFinalPos = finalPos + Vec2i(bailoutX,bailoutY);
+							bool canUnitMove = map->canMove(unit, unit->getPos(), newFinalPos);
+
+							if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
+								char szBuf[4096]="";
+								sprintf(szBuf,"[attempting to BAIL OUT] finalPos [%s] newFinalPos [%s] ts [%d] canUnitMove [%d]",
+										finalPos.getString().c_str(),newFinalPos.getString().c_str(),ts,canUnitMove);
+								unit->logSynchData(__FILE__,__LINE__,szBuf);
+							}
+
+							if(canUnitMove) {
+								ts= aStar(unit, newFinalPos, true);
+							}
+						}
 					}
 				}
 			}
diff --git a/source/glest_game/ai/path_finder.h b/source/glest_game/ai/path_finder.h
index 0e2fc8fa..fd503476 100644
--- a/source/glest_game/ai/path_finder.h
+++ b/source/glest_game/ai/path_finder.h
@@ -56,6 +56,7 @@ public:
 	static const int maxFreeSearchRadius;
 	static const int pathFindNodesMax;
 	static const int pathFindRefresh;
+	static const int pathFindBailoutRadius;
 
 private:
 	std::map<Vec2i, bool> openPosList;
@@ -65,6 +66,7 @@ private:
 	std::vector<Node> nodePool;
 	int nodePoolCount;
 	const Map *map;
+	RandomGen random;
 
 	//std::map<Vec2i, std::map<Vec2i, std::map<int, std::map<Field,bool> > > > lookupCacheCanMove;
 	std::map<Vec2i, std::map<Vec2i, std::map<int, std::map<int, std::map<Field,bool> > > > > moveLookupCacheApproxCanMove;
diff --git a/source/glest_game/type_instances/unit.cpp b/source/glest_game/type_instances/unit.cpp
index 96357db4..f35fd7f4 100644
--- a/source/glest_game/type_instances/unit.cpp
+++ b/source/glest_game/type_instances/unit.cpp
@@ -1876,6 +1876,9 @@ bool Unit::isBadHarvestPos(const Vec2i &value, bool checkPeerUnits) const {
 void Unit::cleanupOldBadHarvestPos() {
 	const int cleanupInterval = (GameConstants::updateFps * 5);
 	bool needToCleanup = (getFrameCount() % cleanupInterval == 0);
+
+	//printf("========================> cleanupOldBadHarvestPos() [%d] badHarvestPosList.size [%ld] cleanupInterval [%d] getFrameCount() [%d] needToCleanup [%d]\n",getFrameCount(),badHarvestPosList.size(),cleanupInterval,getFrameCount(),needToCleanup);
+
 	if(needToCleanup == true) {
 		//printf("========================> cleanupOldBadHarvestPos() [%d] badHarvestPosList.size [%ld]\n",getFrameCount(),badHarvestPosList.size());