--- a/src/order_cmd.cpp	Sun Apr 13 19:25:14 2008 +0000
+++ b/src/order_cmd.cpp	Sun Apr 13 19:46:26 2008 +0000
@@ -216,9 +216,7 @@
 	 * Sanity check
 	 * TTD stores invalid orders as OT_NOTHING with non-zero flags/station
 	 */
-	if (!order.IsValid() && (order.GetLoadType() != 0 || order.GetUnloadType() != 0 || order.GetDestination() != 0)) {
-		order.MakeDummy();
-	}
+	if (!order.IsValid() && packed != 0) order.MakeDummy();
 
 	return order;
 }