Fix bugs in forwarding socket again