Fix repaint