Another dependency convergence fix