fixed port-inclusion bug which breaks production branch