Fix 0820 after upstream merge

Fix after psi-im/psi#160