fixed validation errors 7