Index: trunk/psphot/src/psphotReplaceUnfit.c
===================================================================
--- trunk/psphot/src/psphotReplaceUnfit.c	(revision 38515)
+++ trunk/psphot/src/psphotReplaceUnfit.c	(revision 38535)
@@ -316,6 +316,9 @@
     }
 
-    pmSourceFitOptions *fitOptions = psMetadataLookupPtr (&status, readout->analysis, "PCM_FIT_OPTIONS");
-    psAssert (fitOptions, "missing pcm fit options");
+    pmSourceFitOptions *fitOptions = NULL;
+    if (psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_FITS")) {
+        fitOptions = psMetadataLookupPtr (&status, readout->analysis, "PCM_FIT_OPTIONS");
+        psAssert (fitOptions, "missing pcm fit options");
+    }
 
     // XXX the sources have already been copied (merge into here?)
@@ -397,5 +400,4 @@
            pmPCMdata *pcm = pmPCMinit (source, fitOptions, model, maskVal, psfSize);
             if (pcm) {
-                // pmPCMMakeModel (source, model, pcm->nsigma, maskVal, psfSize);
                 pmPCMCacheModel (source, maskVal, psfSize, pcm->nsigma);
                 psFree(pcm);