--- unittools.c.orig	Fri May 18 01:07:19 2001
+++ unittools.c	Fri May 18 01:08:35 2001
@@ -2825,8 +2825,7 @@
       int miscap = missile_carrier_capacity(x, y, playerid);

       /* Not enough capacity. Take anything we can */
-      if ((aircap < capacity || miscap < capacity)
-	  && !(is_ground_unit(ptrans) && ptile->terrain == T_OCEAN)) {
+      if ( !(is_ground_unit(ptrans) && ptile->terrain == T_OCEAN)) {
 	/* We first take nonmissiles, as missiles can be transported on anything,
 	   but nonmissiles can not */
 	if (!missiles_only) {
@@ -2835,7 +2834,7 @@
 	      break;
 	    if (is_air_unit(pcargo)
 		&& pcargo->id != ptrans->id
-		&& pcargo->transported_by != ptrans->id
+		&& pcargo->transported_by == NULL
 		&& !unit_flag(pcargo->type, F_MISSILE)
 		&& pcargo->owner == playerid) {
 	      capacity--;