Fix for rare rich text issues