diff --git a/attr.go b/attr.go
index f641c94..1e75435 100644
--- a/attr.go
+++ b/attr.go
@@ -16,7 +16,7 @@ package tcell
 
 // AttrMask represents a mask of text attributes, apart from color.
 // Note that support for attributes may vary widely across terminals.
-type AttrMask int64
+type AttrMask int
 
 // Attributes are not colors, but affect the display of text.  They can
 // be combined, in some cases, but not others. (E.g. you can have Dim Italic,
diff --git a/cell.go b/cell.go
index d6b0554..0debeee 100644
--- a/cell.go
+++ b/cell.go
@@ -16,6 +16,7 @@ package tcell
 
 import (
 	"os"
+	"reflect"
 
 	runewidth "github.com/mattn/go-runewidth"
 )
@@ -57,7 +58,7 @@ func (cb *CellBuffer) SetContent(x int, y int,
 		// dirty as well as the base cell, to make sure we consider
 		// both cells as dirty together.  We only need to do this
 		// if we're changing content
-		if (c.width > 0) && (mainc != c.currMain) {
+		if (c.width > 0) && (mainc != c.currMain || !reflect.DeepEqual(combc, c.currComb)) {
 			for i := 0; i < c.width; i++ {
 				cb.SetDirty(x+i, y, true)
 			}