Next bug fix: check empty in roundrobin