Bar/beat counter, fix #11