UG-2763 , port finder fix