Fix perfect forwarding