Bugfix, yet lagfree again