[1176] Fix forwarding.