Infer shape broadcast fix