Fixed missing counter increment. Broke schema with multiple indices.
Fix trunk split