diff --git a/cfam_access.cpp b/cfam_access.cpp
index 2538eb0..810a281 100644
--- a/cfam_access.cpp
+++ b/cfam_access.cpp
@@ -66,7 +66,7 @@
                                metadata::PATH(target->getCFAMPath().c_str()));
     }
 
-    data = target->swapEndian(data);
+    data = htobe32(data);
 
     rc = write(target->getCFAMFD(), &data, cfamRegSize);
     if (rc < 0)
@@ -110,7 +110,7 @@
             metadata::CALLOUT_DEVICE_PATH(target->getCFAMPath().c_str()));
     }
 
-    return target->swapEndian(data);
+    return be32toh(data);
 }
 
 void writeRegWithMask(const std::unique_ptr<Target>& target,