fixed round robin issue