Fix (again) selection of port