MERGE: oops counter fixes