fixing validation errors 25