diff --git a/lib/codegen/analysis/align.cc b/lib/codegen/analysis/align.cc
index 66aff113c..95ccb8dc3 100644
--- a/lib/codegen/analysis/align.cc
+++ b/lib/codegen/analysis/align.cc
@@ -287,10 +287,8 @@ std::vector<unsigned> align::populate_max_contiguous_binop(ir::binary_operator*
     }
     if(x->is_int_add_sub()){
       unsigned lvalue = 1, rvalue = 1;
-      if(lhs_cst_info[d].num_cst > 0)
-        lvalue = gcd(rhs_max_contiguous[d], lhs_cst_info[d].num_cst);
-      if(rhs_cst_info[d].num_cst > 0)
-        rvalue = gcd(lhs_max_contiguous[d], rhs_cst_info[d].num_cst);
+      lvalue = gcd(rhs_max_contiguous[d], lhs_starting_multiple[d]);
+      rvalue = gcd(lhs_max_contiguous[d], rhs_starting_multiple[d]);
       value = std::max(lvalue, rvalue);
     }
     result.push_back(value);