fixed validation errors 12