Fighting the forwarding issues