Fix round robbin