Fixed the forwarding functionality