fixed validation errors 1