fixed validation errors 17