draw order NPE bug fixed