Fix count triggers