Bugfix for broken urls with ports
Toolkit 2.0.5