Fixes problems with lag