diff --git a/lib/+artoa/+controller/+edit/+offsets/tableSoundsourceOffsetsEdit.m b/lib/+artoa/+controller/+edit/+offsets/tableSoundsourceOffsetsEdit.m
index 98925ff9372dfbd7c490ca2642c106b3e9578fba..795ffb8998b43e18cb407b19ab5e8070339be9d0 100644
--- a/lib/+artoa/+controller/+edit/+offsets/tableSoundsourceOffsetsEdit.m
+++ b/lib/+artoa/+controller/+edit/+offsets/tableSoundsourceOffsetsEdit.m
@@ -8,9 +8,8 @@ global artoaGui artoaWorkspace artoaDataInput;
 %% Get data
 try
     selectedColumn = event.Indices(2);
-    selectedRow = event.Indices(:, 1);
 catch
-    return;
+    selectedColumn = NaN;
 end
 
 %% Check if the column that has been edited is locked
diff --git a/lib/+artoa/+offsets/addSoundsource.m b/lib/+artoa/+offsets/addSoundsource.m
index 046a7e4b6b17541e417ff6fcac6b2c8207619023..4d384a8fc76113d1f3f5733273f0cc7a37206751 100644
--- a/lib/+artoa/+offsets/addSoundsource.m
+++ b/lib/+artoa/+offsets/addSoundsource.m
@@ -13,13 +13,14 @@ end
 %% Add variable
 offsetsTable(end + 1, :) = artoa.offsets.getDefaultRowValues();
 offsetsTable.Properties.RowNames{end} = pSoundsource.sourcename;
-offsetTable{end, variableNames{1}} = artoa.convert.dmy2rd(pSoundsource.offset(3), pSoundsource.offset(2), pSoundsource.offset(1));
-offsetTable{end, variableNames{2}} = pSoundsource.offset(4);
-offsetTable{end, variableNames{3}} = artoa.convert.dmy2rd(pSoundsource.rcv_offset(3), pSoundsource.rcv_offset(2), pSoundsource.rcv_offset(1));
-offsetTable{end, variableNames{4}} = pSoundsource.rcv_offset(4);
-offsetTable{end, variableNames{5}} = pSoundsource.drift;
-offsetTable{end, variableNames{8}} = pSoundsource.empiric_offset(4);
-offsetTable{end, variableNames{9}} = pSoundsource.empiric_drift;
+variableNames = offsetsTable.Properties.VariableNames;
+offsetsTable{end, variableNames{1}} = artoa.convert.dmy2rd(pSoundsource.offset(3), pSoundsource.offset(2), pSoundsource.offset(1));
+offsetsTable{end, variableNames{2}} = pSoundsource.offset(4);
+offsetsTable{end, variableNames{3}} = artoa.convert.dmy2rd(pSoundsource.rcv_offset(3), pSoundsource.rcv_offset(2), pSoundsource.rcv_offset(1));
+offsetsTable{end, variableNames{4}} = pSoundsource.rcv_offset(4);
+offsetsTable{end, variableNames{5}} = pSoundsource.drift;
+offsetsTable{end, variableNames{8}} = pSoundsource.empiric_offset(4);
+offsetsTable{end, variableNames{9}} = pSoundsource.empiric_drift;
 
 %% Sort rows
 offsetsTable = sortrows(offsetsTable, 'RowNames');