diff --git a/direct/src/deadrec/smoothMover.cxx b/direct/src/deadrec/smoothMover.cxx
index 712df19925..3e98908ee0 100644
--- a/direct/src/deadrec/smoothMover.cxx
+++ b/direct/src/deadrec/smoothMover.cxx
@@ -212,6 +212,7 @@ compute_smooth_position(double timestamp) {
   }
 
   // First, back up in time by the specified delay factor.
+  double orig_timestamp = timestamp;
   timestamp -= _delay;
   if (_accept_clock_skew) {
     timestamp -= get_avg_timestamp_delay();
@@ -304,7 +305,7 @@ compute_smooth_position(double timestamp) {
       set_smooth_pos(point._pos, point._hpr, timestamp);
     }
 
-    if (timestamp - _last_heard_from > _reset_velocity_age) {
+    if (orig_timestamp - _last_heard_from > _reset_velocity_age) {
       // Furthermore, if we haven't heard from this client in a while,
       // reset the velocity.  This decision is based entirely on our
       // local timestamps, not on the other client's reported
diff --git a/direct/src/distributed/DistributedSmoothNode.py b/direct/src/distributed/DistributedSmoothNode.py
index 314290bf27..c70a80b13d 100644
--- a/direct/src/distributed/DistributedSmoothNode.py
+++ b/direct/src/distributed/DistributedSmoothNode.py
@@ -25,7 +25,7 @@ EnablePrediction = base.config.GetBool("smooth-enable-prediction", 1)
 # each avatar, which is intended to compensate for relative clock
 # skew.
 Lag = base.config.GetDouble("smooth-lag", 0.1)
-PredictionLag = base.config.GetDouble("smooth-prediction-lag", -0.1)
+PredictionLag = base.config.GetDouble("smooth-prediction-lag", 0.0)