This should fix the redraw issue