fixed validation errors 15