Fixed latest bugs in round generation algorithm