Bug fix in the networking code