Second Fix for Lag Issues