fixed validation errors 6