diff --git a/HISTORY.rst b/HISTORY.rst
index 8ed4aacce0807d108a3a410e98704277c274864b..ae499d4cb77f68a8b02c71dc769f8fc007727c35 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,12 @@
 History
 =======
 
+0.20.2 (2024-05-30)
+-------------------
+
+* !107: Re-enabled first guess retrievals for water vapour, liquid water, and ice after fixing issues #90 and #92.
+
+
 0.20.1 (2024-03-05)
 -------------------
 
diff --git a/enpt/processors/atmospheric_correction/atmospheric_correction.py b/enpt/processors/atmospheric_correction/atmospheric_correction.py
index 973265239f7ef8ca2291494e4713f74ded0d8298..8561e944133da449fd83f55766f4a11f081fb30e 100644
--- a/enpt/processors/atmospheric_correction/atmospheric_correction.py
+++ b/enpt/processors/atmospheric_correction/atmospheric_correction.py
@@ -73,6 +73,7 @@ class AtmosphericCorrector(object):
 
             options["retrieval"]["cpu"] = self.cfg.CPUs or cpu_count()
             options["retrieval"]["disable_progressbars"] = self.cfg.disable_progress_bars
+            options["retrieval"]["segmentation"] = True
 
             # TODO: issue is closed -> revise
             # temporarily disable uncertainty measures to avoid https://git.gfz-potsdam.de/EnMAP/sicor/-/issues/86
@@ -82,16 +83,16 @@ class AtmosphericCorrector(object):
             # set land_only mode
             options["retrieval"]["land_only"] = land_only
 
-            # disable first guess water vapor retrieval for now
-            options["retrieval"]["state_vector"]["water_vapor"]["use_prior_mean"] = True
-            options["retrieval"]["state_vector"]["water_vapor"]["prior_mean"] = \
-                enmap_ImageL1.meta.water_vapour  # = default = 2.5
+            # disable first guess water vapor retrieval
+            # options["retrieval"]["state_vector"]["water_vapor"]["use_prior_mean"] = True
+            # options["retrieval"]["state_vector"]["water_vapor"]["prior_mean"] = \
+            #     enmap_ImageL1.meta.water_vapour  # = default = 2.5
 
             # disable first guess liquid water retrieval for now
-            options["retrieval"]["state_vector"]["liquid_water"]["use_prior_mean"] = True
+            # options["retrieval"]["state_vector"]["liquid_water"]["use_prior_mean"] = True
 
             # disable first guess ice retrieval for now
-            options["retrieval"]["state_vector"]["ice"]["use_prior_mean"] = True
+            # options["retrieval"]["state_vector"]["ice"]["use_prior_mean"] = True
 
         except FileNotFoundError:
             raise FileNotFoundError(f'Could not locate options file for atmospheric correction at {path_opts}')