diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java
index 6ab098d145..9ae25420cf 100644
--- a/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java
+++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java
@@ -128,7 +128,7 @@ protected List<Pulse> getPulses(int n, IndexedTable it, DataBank wfBank) {
         short[] samples = new short[n];
         for (int i=0; i<wfBank.rows(); ++i) {
             for (int j=0; j<n; ++j)
-                samples[j] = wfBank.getShort(String.format("s%d",j+1), i);
+                samples[j] = wfBank.getShort(j+5, i);
             long timestamp = wfBank.getLong("timestamp",i);
             int time = wfBank.getInt("time",i);
             List<Pulse> p = it==null ? extract(null, i, timestamp, time, samples) :
@@ -146,7 +146,7 @@ protected List<Pulse> getPulses(int n, IndexedTable it, Bank wfBank) {
         short[] samples = new short[n];
         for (int i=0; i<wfBank.getRows(); ++i) {
             for (int j=0; j<n; ++j)
-                samples[j] = wfBank.getShort(String.format("s%d",j+1), i);
+                samples[j] = wfBank.getShort(j+5, i);
                 // FIXME:  Can speed this up (but looks like not for DataBank?):
                 //samples[j] = wfBank.getShort(String.format(5+j,j+1), i);
             int time = wfBank.getInt("time",i);