fixed validation errors 14