Fix #442 redraw problem