Better fix of the network issue