FL-863: psi fix