--- a/src/roadveh_cmd.cpp	Tue Jun 12 20:24:12 2007 +0000
+++ b/src/roadveh_cmd.cpp	Tue Jun 12 22:13:49 2007 +0000
@@ -1085,15 +1085,8 @@
 
 static int PickRandomBit(uint bits)
 {
-	uint num = 0;
-	uint b = bits;
 	uint i;
-
-	do {
-		if (b & 1) num++;
-	} while (b >>= 1);
-
-	num = RandomRange(num);
+	uint num = RandomRange(CountBitsSet(bits));
 
 	for (i = 0; !(bits & 1) || (int)--num >= 0; bits >>= 1, i++) {}
 	return i;