Fix after Psi upstream changes