fixed validation errors 16