fixed validation errors 19