diff --git a/script/keithley.py b/script/keithley.py
index dc46b000..9a5e08cb 100644
--- a/script/keithley.py
+++ b/script/keithley.py
@@ -7,6 +7,7 @@ class Keithley(object):
     USER_MODE_STATES = ['def setting', 'poll curr fast', 'poll curr medi', 'poll curr slow', 'trig setting', 'trigger BUS', 'trigger TLIN', 'trigger EXT', 'poll volt medi']
     
     def __init__(self, base_name, base_channel):
+        self.dwell = 0.
         self.base_channel = base_channel
         self.base_name = base_name
         self.rangeCh = None
@@ -79,6 +80,7 @@ class Keithley(object):
         nplc = min(nplc, 10.)
         self.nplcCh.write(nplc)
         self.navgCh.write(navg)
+        self.dwell = self.tottimeCh.read() / 1000.
 
     def trig(self):
         """
@@ -93,6 +95,7 @@ class Keithley(object):
         get dwell time in seconds.
         """
         dwell = self.tottimeCh.read() / 1000.
+        self.dwell = dwell
         return dwell
     
     def fetch(self):
diff --git a/script/local.py b/script/local.py
index 9e58441f..fd082405 100644
--- a/script/local.py
+++ b/script/local.py
@@ -119,7 +119,7 @@ def wait_keithleys():
     wait for one dwell time so that the keithleys can finish their measurement.
     if we polled them too early, they would produce an error message.
     """
-    time.sleep(KeiSample.get_dwell() * 2.1)
+    time.sleep(KeiSample.dwell * 1.1)
 
 def fetch_keithleys():
     """