back-port bugfix for port-tracker