Merge pull request #1661 from dneto0/fix-leak

Avoid leaking name for counter buffer