Temporarily work around the bug when port numbers are reused between