fix yield - remove depending on the round-robin