fixing validation errors 30