diff --git a/cal_tools/cal_tools/agipdlib.py b/cal_tools/cal_tools/agipdlib.py
index dc2d49e9b71e88972b319bdd82aeb97915ab080e..11d4438584b2db40bea2970558a1066269cc6e2c 100644
--- a/cal_tools/cal_tools/agipdlib.py
+++ b/cal_tools/cal_tools/agipdlib.py
@@ -262,9 +262,9 @@ class AgipdCorrections:
             # so it's efficient to examine the file structure.
             for field in image_fields:
                 arr = data_dict[field][:n_img]
-                kw = {}
+                kw = {'fletcher32': True}
                 if field in compress_fields:
-                    kw.update(compression='gzip', compression_opts=1)
+                    kw.update(compression='gzip', compression_opts=1, shuffle=True)
                 if arr.ndim > 1:
                     kw['chunks'] = (1,) + arr.shape[1:]  # 1 chunk = 1 image