Fixed #709
Couldn't test because Linux can't run non-SP listen servers.