fixing validation errors 37