Fix load order to avoid dependency error