Fixed not loading in correct order