Revert back to using counters, null check method on M side results in
wrap around bug.