fixing validation errors 28