Initial fix for rendering bug.  Fix seems complete but more testing will be needed to make sure.