fixing validation errors 31