fixed lag issue