Fixed lag issue