Draw order fix