Fix payee handling