fix forwarding