fix empty previous round not update & more