Fixed Rendezvou bug