diff --git a/CEP/ParmDB/src/makesourcedb.cc b/CEP/ParmDB/src/makesourcedb.cc
index dd7c356356dbfdb2d93186fd12c41c466ba6a20b..38430048c7dde20d895e9aca8eeff5828388da49 100644
--- a/CEP/ParmDB/src/makesourcedb.cc
+++ b/CEP/ParmDB/src/makesourcedb.cc
@@ -737,13 +737,22 @@ void fillShapelet (SourceInfo& srcInfo,
   double scaleV = 0;
   Array<double> coeffI, coeffQ, coeffU, coeffV;
   readShapelet (shpI, coeffI, scaleI);
-  if (! shpQ.empty()) {
+  if (shpQ.empty()) {
+    coeffQ = coeffI;
+    scaleQ = scaleI;
+  } else {
     readShapelet (shpQ, coeffQ, scaleQ);
   }
-  if (! shpU.empty()) {
+  if (shpU.empty()) {
+    coeffU = coeffI;
+    scaleU = scaleI;
+  } else {
     readShapelet (shpU, coeffU, scaleU);
   }
-  if (! shpV.empty()) {
+  if (shpV.empty()) {
+    coeffV = coeffI;
+    scaleV = scaleI;
+  } else {
     readShapelet (shpV, coeffV, scaleV);
   }
   srcInfo.setShapeletCoeff (coeffI, coeffQ, coeffU, coeffV);