fixed some forwarding issues