diff --git a/liberty/LibertyReader.cc b/liberty/LibertyReader.cc
index 049d345c..7cf3491d 100644
--- a/liberty/LibertyReader.cc
+++ b/liberty/LibertyReader.cc
@@ -2526,7 +2526,7 @@ LibertyReader::endOutputCurrentRiseFall(LibertyGroup *group)
     slew_axis->findAxisIndex(waveform->slew(), slew_index, slew_exists);
     cap_axis->findAxisIndex(waveform->cap(), cap_index, cap_exists);
     if (slew_exists && cap_exists) {
-      size_t index = slew_index * slew_axis->size() + cap_index;
+      size_t index = slew_index * cap_axis->size() + cap_index;
       current_waveforms[index] = waveform->stealCurrents();
       (*ref_times)[slew_index] = waveform->referenceTime();
     }
diff --git a/liberty/TableModel.cc b/liberty/TableModel.cc
index 7ec97126..8400bc2f 100644
--- a/liberty/TableModel.cc
+++ b/liberty/TableModel.cc
@@ -1639,11 +1639,11 @@ OutputWaveforms::timeCurrent(float slew,
 {
   size_t slew_index = slew_axis_->findAxisIndex(slew);
   size_t cap_index = cap_axis_->findAxisIndex(cap);
-  size_t slew_count = slew_axis_->size();
-  size_t wave_index00 = slew_index * slew_count + cap_index;
-  size_t wave_index01 = slew_index * slew_count + (cap_index + 1);
-  size_t wave_index10 = (slew_index + 1) * slew_count + cap_index;
-  size_t wave_index11 = (slew_index + 1) * slew_count + (cap_index + 1);
+  size_t cap_count = cap_axis_->size();
+  size_t wave_index00 = slew_index * cap_count + cap_index;
+  size_t wave_index01 = slew_index * cap_count + (cap_index + 1);
+  size_t wave_index10 = (slew_index + 1) * cap_count + cap_index;
+  size_t wave_index11 = (slew_index + 1) * cap_count + (cap_index + 1);
 
   const Table1 *waveform00 = current_waveforms_[wave_index00];
   const Table1 *waveform01 = current_waveforms_[wave_index01];
@@ -1710,11 +1710,11 @@ OutputWaveforms::voltageTime(float slew,
 {
   size_t slew_index = slew_axis_->findAxisIndex(slew);
   size_t cap_index = cap_axis_->findAxisIndex(cap);
-  size_t slew_count = slew_axis_->size();
-  size_t wave_index00 = slew_index * slew_count + cap_index;
-  size_t wave_index01 = slew_index * slew_count + (cap_index + 1);
-  size_t wave_index10 = (slew_index + 1) * slew_count + cap_index;
-  size_t wave_index11 = (slew_index + 1) * slew_count + (cap_index + 1);
+  size_t cap_count = cap_axis_->size();
+  size_t wave_index00 = slew_index * cap_count + cap_index;
+  size_t wave_index01 = slew_index * cap_count + (cap_index + 1);
+  size_t wave_index10 = (slew_index + 1) * cap_count + cap_index;
+  size_t wave_index11 = (slew_index + 1) * cap_count + (cap_index + 1);
   float cap0 = cap_axis_->axisValue(cap_index);
   float cap1 = cap_axis_->axisValue(cap_index + 1);
 
@@ -1835,11 +1835,11 @@ OutputWaveforms::voltageCurrent(float slew,
 {
   size_t slew_index = slew_axis_->findAxisIndex(slew);
   size_t cap_index = cap_axis_->findAxisIndex(cap);
-  size_t slew_count = slew_axis_->size();
-  size_t wave_index00 = slew_index * slew_count + cap_index;
-  size_t wave_index01 = slew_index * slew_count + (cap_index + 1);
-  size_t wave_index10 = (slew_index + 1) * slew_count + cap_index;
-  size_t wave_index11 = (slew_index + 1) * slew_count + (cap_index + 1);
+  size_t cap_count = cap_axis_->size();
+  size_t wave_index00 = slew_index * cap_count + cap_index;
+  size_t wave_index01 = slew_index * cap_count + (cap_index + 1);
+  size_t wave_index10 = (slew_index + 1) * cap_count + cap_index;
+  size_t wave_index11 = (slew_index + 1) * cap_count + (cap_index + 1);
   float cap0 = cap_axis_->axisValue(cap_index);
   float cap1 = cap_axis_->axisValue(cap_index + 1);