bugfix in the counter
Merge branch 'master' into data