diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp
index 171beac6..d6371561 100644
--- a/broker/JFJochStateMachine.cpp
+++ b/broker/JFJochStateMachine.cpp
@@ -112,12 +112,14 @@ void LoadDatasetSettings(DiffractionExperiment& experiment, const JFJochProtoBuf
         experiment.FilePrefix(settings.file_prefix());
         experiment.DataFileCount(settings.data_file_count());
         if (settings.has_unit_cell())
-            experiment.SetUnitCell(UnitCell(settings.unit_cell().a(),
-                                            settings.unit_cell().b(),
-                                            settings.unit_cell().c(),
-                                            settings.unit_cell().alpha(),
-                                            settings.unit_cell().beta(),
-                                            settings.unit_cell().gamma()));
+            experiment.SetUnitCell(
+                    UnitCell{.a = settings.unit_cell().a(),
+                            .b = settings.unit_cell().b(),
+                            .c = settings.unit_cell().c(),
+                            .alpha = settings.unit_cell().alpha(),
+                            .beta = settings.unit_cell().beta(),
+                            .gamma = settings.unit_cell().gamma()}
+            );
         else
             experiment.SetUnitCell();
         experiment.SpaceGroupNumber(settings.space_group_number());