diff --git a/lisainstrument/instrument.py b/lisainstrument/instrument.py
index 3a0998114a79c8bab0103b1a82b5012e19882958..052f026a4d5d75cb9c8cd526f4ac4927353f4e4b 100755
--- a/lisainstrument/instrument.py
+++ b/lisainstrument/instrument.py
@@ -236,6 +236,11 @@ class Instrument:
             np.arange(self.physics_size + self.initial_telemetry_physics_size, dtype=np.float64) * self.physics_dt
         self.physics_et_withinitial = self.physics_t_withinitial - self.t0
 
+        # Orbits, gravitational waves, glitches
+        self.init_orbits(orbits, orbit_dataset)
+        self.init_gws(gws)
+        self.init_glitches(glitches)
+
         # Instrument topology
         self.central_freq = float(central_freq)
         self.init_lock(lock)
@@ -382,11 +387,6 @@ class Instrument:
         else:
             self.mosa_angles = ForEachMOSA(mosa_angles)
 
-        # Orbits, gravitational waves, glitches
-        self.init_orbits(orbits, orbit_dataset)
-        self.init_gws(gws)
-        self.init_glitches(glitches)
-
         # Interpolation and antialiasing filter
         self.init_interpolation(interpolation)
         self.init_aafilter(aafilter)