diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index 0f0c4eb59879bd5092e75424d1107977e5c5c437..381e67ba64298f28b3d01a3d64f90d131ac52a5d 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -373,7 +373,12 @@ if strcmp(mapping_for_tcv.method(1:3),'tdi')
         end
         ij = regexpi(mapping_for_tcv.expression,'LIUQE.*\.M','once');
         if ~isempty(ij)
-          mapping_for_tcv.expression = [mapping_for_tcv.expression(1:ij+6) substr_liuqe_tcv_eq mapping_for_tcv.expression(ij+7:end)];
+          ichar_after_liuqe = 7;
+          if strcmp(mapping_for_tcv.expression(ij+ichar_after_liuqe),'2') || ...
+                strcmp(mapping_for_tcv.expression(ij+ichar_after_liuqe),'3')
+            ichar_after_liuqe = 8;
+          end
+          mapping_for_tcv.expression = [mapping_for_tcv.expression(1:ij+6) substr_liuqe_tcv_eq mapping_for_tcv.expression(ij+ichar_after_liuqe:end)];
         end
       else
         ij = regexpi(mapping_for_tcv.expression,'LIUQE.*\.M','once');