diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py
index 3372df32..387aba08 100644
--- a/src/aare/daq/daq.py
+++ b/src/aare/daq/daq.py
@@ -521,15 +521,15 @@ class AareDAQ:
     def sample_geometry(self) -> SampleGeometryModel:
         zoom = self.__devs.zoom
         aerotech_pos_ref = self.__cfg.abr_meas_pos
-        aerotech_coord = self.__devs.aerotech_pos - aerotech_pos_ref
+        aerotech_pos = self.__devs.aerotech_pos
         sample_geom = SampleGeometryModel(
             beam_location_pxl=self.__cfg.beam_mark_coeff.apply(zoom),
             pixel_in_mm=self.__cfg.pixel_to_mm(zoom),
             omega_deg=self.__devs.aerotech_omega,
             smargon=self.__devs.smargon_pos,
             beam_size_mm=self.__cfg.beam_size_mm,
-            aerotech=Coordinate(),
-            aerotech_meas=aerotech_coord
+            aerotech=aerotech_pos - aerotech_pos_ref,
+            aerotech_meas=aerotech_pos
         )
         return sample_geom