fixing validation errors 35