fixed validation errors 3