fixed bug with final-recipient checking