Fix Lagging Issue