Fix counting bug in validate