Fixed draw order updating