fixed the re-rendering and load order problem