*: fixed lag issue (again)