fixed validation errors 5