Working on double redraw bug