(maint) Resolve load order problem