Network fix
Network fix without routing table.
IIT network specific fixes