Fix initial draw order