fixing validation errors 26