diff --git a/userraw/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc
index ab4588f..ce2f637 100644
--- a/userraw/maps/mp/bots/_bot_internal.gsc
+++ b/userraw/maps/mp/bots/_bot_internal.gsc
@@ -587,7 +587,7 @@ doBotMovement()
 		else
 		{
 			// check if need to crouch
-			if (bulletTracePassed(startPos - (0, 0, 25), startPosForward - (0, 0, 25), false, self))
+			if (bulletTracePassed(startPos - (0, 0, 25), startPosForward - (0, 0, 25), false, self) && !self.bot.climbing)
 				self crouch();
 		}
 
@@ -688,6 +688,9 @@ stance()
 
 		if (!isDefined(toStance))
 			toStance = "crouch";
+
+		if(toStance == "stand" && randomInt(100) <= self.pers["bots"]["behavior"]["crouch"])
+			toStance = "crouch";
 			
 		if(toStance == "climb")
 		{
@@ -698,9 +701,6 @@ stance()
 		if(toStance != "stand" && toStance != "crouch" && toStance != "prone")
 			toStance = "crouch";
 			
-		if(toStance == "stand" && randomInt(100) <= self.pers["bots"]["behavior"]["crouch"])
-			toStance = "crouch";
-			
 		if(toStance == "stand")
 			self stand();
 		else if(toStance == "crouch")
diff --git a/userraw/waypoints b/userraw/waypoints
index 1d01e47..ceae192 160000
--- a/userraw/waypoints
+++ b/userraw/waypoints
@@ -1 +1 @@
-Subproject commit 1d01e479169bf36b21cb065c736cddcbefc5622a
+Subproject commit ceae192c2343330ab407838db35edfd7d24b18b6