diff --git a/MAC/Deployment/data/Coordinates/CoordMenu.py b/MAC/Deployment/data/Coordinates/CoordMenu.py
index 4bf7bf0d5cc4d63a061d605b5b09af7dba922260..92d24e14c2e314630c4e27983e5a99016707d358 100755
--- a/MAC/Deployment/data/Coordinates/CoordMenu.py
+++ b/MAC/Deployment/data/Coordinates/CoordMenu.py
@@ -62,7 +62,7 @@ def load_normal_vectors():
         sys.exit()
     res = Popen(['./load_normal_vectors.py',filename]).wait()
     if (res != 0): sys.exit(1)
-    time.sleep(3)
+    #time.sleep(3)
     
 def load_rotation_matrices():
     print 'Loading rotation matrices'
@@ -75,7 +75,7 @@ def load_rotation_matrices():
         sys.exit()
     res = Popen(['./load_rotation_matrices.py',filename]).wait()
     if (res != 0): sys.exit(1)
-    time.sleep(3)
+    #time.sleep(3)
     
 def load_hba_rotations():
     print 'Loading hba field rotations'
@@ -88,11 +88,11 @@ def load_hba_rotations():
         sys.exit()
     res = Popen(['./load_hba_rotations.py',filename]).wait()
     if (res != 0): sys.exit(1)
-    time.sleep(3)
+    #time.sleep(3)
 
 def calculate_hba_deltas():
     print 'calculating hba-deltas'
-    time.sleep(3)
+    #time.sleep(3)
     res = Popen(['./calc_hba_deltas.py']).wait()
     if (res != 0): sys.exit(1)
     
diff --git a/MAC/Deployment/data/Coordinates/make_all_station_file.py b/MAC/Deployment/data/Coordinates/make_all_station_file.py
index 45d4eb26b2f80ff64b0c6eb40b7149d395c7792b..0a8fd449b839c163efee72db3c0821478f6da1e7 100755
--- a/MAC/Deployment/data/Coordinates/make_all_station_file.py
+++ b/MAC/Deployment/data/Coordinates/make_all_station_file.py
@@ -133,7 +133,7 @@ if __name__ == '__main__':
         frame = ''
     
         # from database select all antennas for given station and target-date
-        cursor.execute("select * from get_gen_coord(%s, %f)", (station, float(sys.argv[1])))
+        cursor.execute("select * from get_gen_coord(%s, %f) order by objtype desc", (station, float(sys.argv[1])))
     
         # start with empty arrays
         aPosL = np.zeros((0,2,3))
@@ -188,8 +188,8 @@ if __name__ == '__main__':
             print 'ERR, no data found for %s' %(station)
             exit(1)
              
-        # do somthing with the data
-        print 'Making %s-AntennaField.conf with LBA shape=%s  HBA shape=%s' %(station, np.shape(aPosL), np.shape(aPosL))
+        # do something with the data
+        print 'Making %s-AntennaField.conf with LBA shape=%s  HBA shape=%s' %(station, np.shape(aPosL), np.shape(aPosH))
          
         aRef = None
         
diff --git a/MAC/Deployment/data/Coordinates/make_conf_files.py b/MAC/Deployment/data/Coordinates/make_conf_files.py
index dc9cb38c22af7b72337485e83f203a82ffa2751c..cce35c608b4634059514cf72de9d7e76161e9ee7 100755
--- a/MAC/Deployment/data/Coordinates/make_conf_files.py
+++ b/MAC/Deployment/data/Coordinates/make_conf_files.py
@@ -185,7 +185,9 @@ if __name__ == '__main__':
     frame = ''
     
     # from database select all antennas for given station and target-date
-    cursor.execute("select * from get_gen_coord(%s, %f)", (station, float(sys.argv[2])))
+    # The ''order by'' statement is needed to prevent mixup of even/odd pairs
+    # as was seen on sas001 (Arno)
+    cursor.execute("select * from get_gen_coord(%s, %f) order by objtype desc", (station, float(sys.argv[2])))
     
     # start with empty arrays
     aPosL = np.zeros((0,2,3))
@@ -228,14 +230,13 @@ if __name__ == '__main__':
             
             elif record[1] == 'HBA' or record[1] == 'HBA0' or record[1] == 'HBA1':
                 aPosH = np.concatenate((aPosH, [[even,odd]]), axis=0)
-            
-    
+
     if int(np.shape(aPosL)[0]) == 0 or int(np.shape(aPosH)[0]) == 0:
         print 'ERR, no data found for %s' %(station)
         exit(1)
          
     # do somthing with the data
-    print 'Making %s-AntennaField.conf with LBA shape=%s  HBA shape=%s' %(station, np.shape(aPosL), np.shape(aPosL))
+    print 'Making %s-AntennaField.conf with LBA shape=%s  HBA shape=%s' %(station, np.shape(aPosL), np.shape(aPosH))
      
     aRef = None