Fixed forwarding logic.