Rearrange to correct load order