Fix countEach from last commit