WIP latency bugfix