fixing validation errors 17