Fixing load order