fixed validation errors 2