Fix to network code