Prevent erratic timings

Issue #2 fix