Fixing The Lag --- Take #420