Fix PCE bug to select the correct client port