r3584: fix referral handling