diff --git a/html/html.go b/html/html.go
index 6ba6877bda..3f216c1053 100644
--- a/html/html.go
+++ b/html/html.go
@@ -221,8 +221,12 @@ func (o *Minifier) Minify(m *minify.M, w io.Writer, r io.Reader, _ map[string]st
 			}
 
 			if t.TokenType == html.EndTagToken {
-				t.Data[2+len(t.Text)] = '>'
-				if _, err := w.Write(t.Data[:2+len(t.Text)+1]); err != nil {
+				if len(t.Data) > 2+len(t.Text) {
+					t.Data[2+len(t.Text)] = '>'
+					if _, err := w.Write(t.Data[:2+len(t.Text)+1]); err != nil {
+						return err
+					}
+				} else if _, err := w.Write(t.Data); err != nil {
 					return err
 				}
 				break
diff --git a/html/html_test.go b/html/html_test.go
index 8b6151b515..7510d9fb2e 100644
--- a/html/html_test.go
+++ b/html/html_test.go
@@ -109,9 +109,13 @@ func TestHTML(t *testing.T) {
 		{`<a id="abc" name="abc">y</a>`, `<a id=abc>y</a>`},
 		{`<a id="" value="">y</a>`, `<a value>y</a>`},
 
+		// from Kangax html-minfier
+		{`<span style="font-family:&quot;Helvetica Neue&quot;,&quot;Helvetica&quot;,Helvetica,Arial,sans-serif">text</span>`, `<span style='font-family:"Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif'>text</span>`},
+
 		// go-fuzz
 		{`<meta e t n content=ful><a b`, `<meta e t n content=ful><a b>`},
 		{`<img alt=a'b="">`, `<img alt='a&#39;b=""'>`},
+		{`</b`, `</b`},
 	}
 
 	m := minify.New()