The beginning of this network connect bug fix