fixed validation errors 8