Hopefully fixed join, should be rfc compliant now