Counter issue need to be fixed