diff --git a/core-buffer/include/eiger.hpp b/core-buffer/include/eiger.hpp
index 2038d00..6eee1ea 100644
--- a/core-buffer/include/eiger.hpp
+++ b/core-buffer/include/eiger.hpp
@@ -19,7 +19,6 @@
 #define MODULE_Y_SIZE 512
 #define MODULE_N_PIXELS 131072
 #define PIXEL_N_BYTES 2
-#define MODULE_N_BYTES 262144
 #define GAP_X_MODULE_PIXELS 2
 #define GAP_Y_MODULE_PIXELS 2
 #define GAP_X_EIGERMOD_PIXELS 8
diff --git a/jf-udp-recv/src/main.cpp b/jf-udp-recv/src/main.cpp
index 027fce4..b2e84fc 100644
--- a/jf-udp-recv/src/main.cpp
+++ b/jf-udp-recv/src/main.cpp
@@ -47,8 +47,7 @@ int main (int argc, char *argv[]) {
     auto socket = bind_socket(ctx, config.detector_name, to_string(module_id));
 
     ModuleFrame meta;
-    // TODO: This will not work. Only if Eiger sends in 16 bit. Use MODULE_N_PIXELS * bit_depth / 8
-    char* data = new char[MODULE_N_BYTES];
+    char* data = new char[MODULE_N_PIXELS * bit_depth / 8];
 
     uint64_t pulse_id_previous = 0;
     uint64_t frame_index_previous = 0;