Fixed part of the validation issue.