fix hanging on multiple rounds