diff --git a/modules/comscripts/comlixfit.py b/modules/comscripts/comlixfit.py
index d7169bf..3535674 100755
--- a/modules/comscripts/comlixfit.py
+++ b/modules/comscripts/comlixfit.py
@@ -284,16 +284,19 @@ class comlixfit(ctools.cslikelihood):
             if iter == 0:
                 best_obs = self.obs().copy()
 
-            # Optionally fix or free fixed spatial extension parameters
-            if self['fix_ext_for_initial'].boolean():
-                if iter == 0:
-                    self._fix_ext_pars()
-                else:
-                    self._free_fixed_ext_pars()
+            # Optionally fix spatial extension parameters for first
+            # iteration
+            if iter == 0 and self['fix_ext_for_initial'].boolean():
+                self._fix_ext_pars()
 
             # Fit model
             self.obs().optimize(self.opt())
 
+            # Optionally free fixed spatial extension parameters for first
+            # iteration
+            if iter == 0 and self['fix_ext_for_initial'].boolean():
+                self._free_fixed_ext_pars()
+
             # Compute logL difference
             if iter > 0:
                 delta = logL - self.opt().value()
@@ -334,9 +337,6 @@ class comlixfit(ctools.cslikelihood):
         # value are used for final model fitting.
         self.obs(best_obs)
 
-        # Make sure that any fixed extension parameter is free'd
-        self._free_fixed_ext_pars()
-
         # Do final model fit
         self._final_model_fit()