Changed the way the RR sender is chosen. Fixing it in some cases