Fix lag issue