diff --git a/src/main/java/org/opensextant/solrtexttagger/TaggerRequestHandler.java b/src/main/java/org/opensextant/solrtexttagger/TaggerRequestHandler.java
index 993173b..49ac0ad 100644
--- a/src/main/java/org/opensextant/solrtexttagger/TaggerRequestHandler.java
+++ b/src/main/java/org/opensextant/solrtexttagger/TaggerRequestHandler.java
@@ -182,8 +182,10 @@ protected void tagCallback(int startOffset, int endOffset, Object docIdsKey) {
                         startOffset, endOffset);
                 return;
               }
-              startOffset = offsetPair[0];
-              endOffset = offsetPair[1]<0?inputString.length():offsetPair[1];
+              if(offsetPair[0]>=0 && offsetPair[1]>=0 ) {
+            	  startOffset = offsetPair[0];
+              	  endOffset = offsetPair[1];
+              }
             }
 
             NamedList tag = new NamedList();
diff --git a/src/test/java/org/opensextant/solrtexttagger/HtmlInterpolationTest.java b/src/test/java/org/opensextant/solrtexttagger/HtmlInterpolationTest.java
index 698596d..a0f8831 100644
--- a/src/test/java/org/opensextant/solrtexttagger/HtmlInterpolationTest.java
+++ b/src/test/java/org/opensextant/solrtexttagger/HtmlInterpolationTest.java
@@ -30,6 +30,7 @@ public class HtmlInterpolationTest extends XmlInterpolationTest {
   public void setUp() throws Exception {
     super.setUp();
     baseParams.set("htmlOffsetAdjust", "true");
+    baseParams.set("matchText", "true");
   }
 
   @Override
@@ -58,6 +59,7 @@ public void testHtml() throws Exception {
     assertXmlTag("start end <em>other text</em>", true);
     assertXmlTag("start end<em> other text</em>", true);
     assertXmlTag("<em>other text</em> start end", true);
+    assertXmlTag("start <td/> end", true);
   }
   
   @Test