Round-counter finally fixed