Index: trunk/psModules/src/camera/pmFPAfileDefine.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 21314)
+++ trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 22699)
@@ -21,5 +21,5 @@
 #include "pmFPAConstruct.h"
 
-#include "pmConcepts.h"
+#include "pmConceptsCopy.h"
 
 # define FPA_TEST_ASSERT(A){ \
@@ -1024,8 +1024,8 @@
         }
 
-	// XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
-	// we are going to replace it when we determine the true file.  blow this away here...
-	psFree (file->fpa);
-	file->fpa = NULL;
+        // XXX A TEST: this is a provisional fpa until we read the first header for this pmFPAfile
+        // we are going to replace it when we determine the true file.  blow this away here...
+        psFree (file->fpa);
+        file->fpa = NULL;
     }
 
@@ -1184,5 +1184,5 @@
 
     // inherit the concepts from the src fpa:
-    pmFPACopyConcepts(file->fpa, file->src);
+    pmConceptsCopyFPA(file->fpa, file->src, true, true);
 
     return file;