fix final round bugs