diff --git a/modules/deeplearning/icing_fcn.py b/modules/deeplearning/icing_fcn.py
index c92cc46bb6bed077a89f7b46aea3f1065acd2ac0..f603c5d6bb47569b197b4bfd51dab0fdc3443216 100644
--- a/modules/deeplearning/icing_fcn.py
+++ b/modules/deeplearning/icing_fcn.py
@@ -441,11 +441,20 @@ class IcingIntensityFCN:
         dataset = dataset.cache()
         self.test_dataset = dataset
 
+    # def get_evaluate_dataset(self, indexes):
+    #     indexes = list(indexes)
+    #
+    #     dataset = tf.data.Dataset.from_tensor_slices(indexes)
+    #     dataset = dataset.map(self.data_function_evaluate, num_parallel_calls=8)
+    #     self.eval_dataset = dataset
+
     def get_evaluate_dataset(self, indexes):
         indexes = list(indexes)
 
         dataset = tf.data.Dataset.from_tensor_slices(indexes)
+        dataset = dataset.batch(PROC_BATCH_SIZE)
         dataset = dataset.map(self.data_function_evaluate, num_parallel_calls=8)
+        dataset = dataset.cache()
         self.eval_dataset = dataset
 
     def setup_pipeline(self, filename_l1b_trn, filename_l1b_tst, filename_l2_trn, filename_l2_tst, trn_idxs=None, tst_idxs=None, seed=None):