diff --git a/lib/+artoa/+controller/copyRfbToWorkspace.m b/lib/+artoa/+controller/copyRfbToWorkspace.m
index 237e904e3484992fc12d749e0a7d489b972506de..a1b94025a80805c89ef785196b2554867d77d424 100644
--- a/lib/+artoa/+controller/copyRfbToWorkspace.m
+++ b/lib/+artoa/+controller/copyRfbToWorkspace.m
@@ -66,14 +66,17 @@ artoaWorkspace.statusPressure = zeros(size(artoaDataInput.rfb.DATA, 1), 1);
 
 %% SET DEFAULTS TO NaN
 % toa
-default = artoaDataInput.ini.defaults.toa;
-artoaWorkspace.toaData.toa(artoaWorkspace.toaData.toa == default) = NaN;
+artoa.data.replaceValuesWithNaN( ...
+    artoaWorkspace.toaData.toa, artoaDataInput.ini.defaults.toa ...
+);
 % temperature
-default = artoaDataInput.ini.defaults.temperature;
-artoaWorkspace.temperature(artoaWorkspace.temperature == default) = NaN;
+artoa.data.replaceValuesWithNaN( ...
+    artoaWorkspace.temperature, artoaDataInput.ini.defaults.temperature ...
+);
 % pressure
-default = artoaDataInput.ini.defaults.pressure;
-artoaWorkspace.pressure(artoaWorkspace.pressure == default) = NaN;
+artoa.data.replaceValuesWithNaN( ...
+    artoaWorkspace.pressure, artoaDataInput.ini.defaults.pressure ...
+);
 
 %% FLOAT DETAILS
 artoaWorkspace.float = artoaDataInput.rfb.FLOAT;