Fix network bug introduced in my original refactoring