Index: trunk/psphot/src/psphotSourceFits.c
===================================================================
--- trunk/psphot/src/psphotSourceFits.c	(revision 36086)
+++ trunk/psphot/src/psphotSourceFits.c	(revision 36100)
@@ -589,11 +589,16 @@
     if (TIMING) { psTimerStart ("psphotFitPCM"); }
 
+    // if we are ever (in a given psphot implementation) going to fit a parameter, we must set the options here to include
+    // that parameter (otherwise pmPCMupdate will fail to allocate the dmodelFlux image)
+    // thus, if the sersic analysis below uses an index fit, need to use this EXT_AND_SKY mode for init
+
+    options.mode = PM_SOURCE_FIT_EXT;
     if (modelType == pmModelClassGetType("PS_MODEL_SERSIC")) {
-	options.mode = PM_SOURCE_FIT_NO_INDEX; // XXX note that there may be a conflict with psphotExtendedSourceFits.c:133
 	options.mode = PM_SOURCE_FIT_EXT_AND_SKY;
-	// if we are ever (in a given psphot implementation) going to fit a parameter, we must set the options here to include
-	// that parameter (otherwise pmPCMupdate will fail to allocate the dmodelFlux image)
-	// thus, if the sersic analysis below uses an index fit, need to use this EXT_AND_SKY mode for init
-    } else {
+    }
+    if (modelType == pmModelClassGetType("PS_MODEL_DEV")) {
+	options.mode = PM_SOURCE_FIT_SHAPE;
+    }
+    if (modelType == pmModelClassGetType("PS_MODEL_EXP")) {
 	options.mode = PM_SOURCE_FIT_EXT_AND_SKY;
     }