diff --git a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Delivery.java b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Delivery.java
index 9626b491f..f31ecb445 100644
--- a/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Delivery.java
+++ b/src/main/java/com/oltpbenchmark/benchmarks/tpcc/procedures/Delivery.java
@@ -104,7 +104,7 @@ public void run(Connection conn, Random gen, int w_id, int numWarehouses, int te
 
         int[] orderIDs = new int[10];
 
-        for (d_id = 1; d_id <= terminalDistrictUpperID; d_id++) {
+        for (d_id = 1; d_id <= TPCCConfig.configDistPerWhse; d_id++) {
             Integer no_o_id = getOrderId(conn, w_id, d_id);
 
             if (no_o_id == null) {