fixed validation errors 18