Fix round robin issue