Added (possible) final latency fixed