yet another 'final' networking fix/improvement ;]