diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index c16fa4363..6c9fc77de 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -3924,7 +3924,6 @@ void
 processorders (void)
 {
   static int init = 0;
-  region *r;
   const char * str;
 
   if (!init) {
@@ -3947,12 +3946,6 @@ processorders (void)
    * Beschreibungen geändert haben */
   update_spells();
   warn_password();
-
-  /* we reorder the owners to be at the top of the building 
-   * and also everyone in the same building/ship in sequence */
-  for (r = regions;r;r=r->next) {
-    reorder_units(r);
-  }
 }
 
 int
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 26d9c86ff..e9b7a9888 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -2236,6 +2236,7 @@ report_plaintext(const char * filename, report_context * ctx, const char * chars
           nr_unit(F, f, u, 4, sr->mode);
         }
       }
+      assert(!u->building);
       u = u->next;
     }
     while (sh) {
@@ -2253,6 +2254,8 @@ report_plaintext(const char * filename, report_context * ctx, const char * chars
       }
     }
 
+    assert(!u);
+
     rnl(F);
     rpline(F);
   }
diff --git a/src/common/kernel/reports.c b/src/common/kernel/reports.c
index b5c73a1a9..ba0d939ee 100644
--- a/src/common/kernel/reports.c
+++ b/src/common/kernel/reports.c
@@ -1275,6 +1275,8 @@ prepare_reports(void)
     unit * u;
     plane * p = r->planep;
 
+    reorder_units(r);
+
     if (p) {
       watcher * w = p->watchers;
       for (;w;w=w->next) {