Fix support for counters