diff --git a/Build/mkall.targets b/Build/mkall.targets
index e9f0dc10be..2aae7bf96f 100644
--- a/Build/mkall.targets
+++ b/Build/mkall.targets
@@ -287,7 +287,7 @@
9.4.0.1-beta
11.0.0-beta0121
70.1.123
- 3.6.1
+ 3.6.6
1.1.1-beta0001
bt393
diff --git a/Build/nuget-common/packages.config b/Build/nuget-common/packages.config
index d84860f035..ea0ceffbf5 100644
--- a/Build/nuget-common/packages.config
+++ b/Build/nuget-common/packages.config
@@ -64,8 +64,8 @@
-
-
+
+
diff --git a/Src/LexText/Interlinear/ComplexConcPatternModel.cs b/Src/LexText/Interlinear/ComplexConcPatternModel.cs
index 2b988d8b5a..bf02db7473 100644
--- a/Src/LexText/Interlinear/ComplexConcPatternModel.cs
+++ b/Src/LexText/Interlinear/ComplexConcPatternModel.cs
@@ -135,7 +135,20 @@ public IEnumerable Search(IStText text)
IParaFragment lastFragment = null;
var data = new ComplexConcParagraphData(m_featSys, para);
Match match = m_matcher.Match(data);
- while (match.Success)
+ if (match.Success && match.Range.Start == null)
+ {
+ // We aren't interested in matching the empty string.
+ IEnumerable> allMatches = m_matcher.AllMatches(data);
+ foreach (var m in allMatches)
+ {
+ if (m.Success && m.Range.Start != null)
+ {
+ match = m;
+ break;
+ }
+ }
+ }
+ while (match.Success && match.Range.Start != null)
{
if (match.Range.Start == match.Range.End
&& ((FeatureSymbol)match.Range.Start.Annotation.FeatureStruct