Next-round logic fixed