Fix forwarding bug