Fix port number duplication