The number of units is now controlled during validation.