Hopefully fixed lag issue