diff --git a/compiler/lib/Conversion/HLFHETensorOpsToLinalg/TensorOpsToLinalg.cpp b/compiler/lib/Conversion/HLFHETensorOpsToLinalg/TensorOpsToLinalg.cpp
index 7b08adc0f..60734a59a 100644
--- a/compiler/lib/Conversion/HLFHETensorOpsToLinalg/TensorOpsToLinalg.cpp
+++ b/compiler/lib/Conversion/HLFHETensorOpsToLinalg/TensorOpsToLinalg.cpp
@@ -130,8 +130,8 @@ getBroadcastedAffineMap(const mlir::RankedTensorType &resultType,
   auto operandShape = operandType.getShape();
   affineExprs.reserve(resultShape.size());
   size_t deltaNumDim = resultShape.size() - operandShape.size();
-  for (auto i = 0; i < operandShape.size(); i++) {
-    if (operandShape[i] == 1 && resultShape[i + deltaNumDim] != 1) {
+  for (size_t i = 0; i < operandShape.size(); i++) {
+    if (operandShape[i] == 1) {
       affineExprs.push_back(rewriter.getAffineConstantExpr(0));
     } else {
       affineExprs.push_back(rewriter.getAffineDimExpr(i + deltaNumDim));