Fixed bug with load order