fixing validation errors 21