Hopefully this really fixes late packet handling.