Index: /branches/bills_branches/bills_201312/psModules/src/objects/pmSourceIO_CFF.c
===================================================================
--- /branches/bills_branches/bills_201312/psModules/src/objects/pmSourceIO_CFF.c	(revision 36388)
+++ /branches/bills_branches/bills_201312/psModules/src/objects/pmSourceIO_CFF.c	(revision 36389)
@@ -123,5 +123,6 @@
         source->type = PM_SOURCE_TYPE_STAR; // XXX this should be added to the flags
 
-	// XXX we can set this in general, but for a specific image, we need to weed out SATSTARS
+	// XXX we can set this in general, but for a specific image, we need to weed out SATSTARS and
+        // stars that are masked
         if (psfStar) {
 	    source->tmpFlags |= PM_SOURCE_TMPF_CANDIDATE_PSFSTAR;
@@ -246,7 +247,8 @@
         psS32 modelType = 0;
         bool fitGalaxy = false;
-        bool psfStar = false;
+        bool psfStar = (source->mode & PM_SOURCE_MODE_PSFSTAR) ? true : false;
         psF32 sersicIndex = 0;
-        if (source->modelFits == NULL) {
+        // For now only perform galaxy fits on extended objects
+        if (source->modelEXT == NULL) {
             pmModel *model = source->modelPSF;
             if (model == NULL) continue;
@@ -260,5 +262,4 @@
             yPos = model->params->data.F32[PM_PAR_YPOS];
             flux = source->psfFlux;
-            psfStar = (source->mode & PM_SOURCE_MODE_PSFSTAR) ? true : false;
             rMajor = 0;
             rMinor = 0;