More compatibility with non RFC-compliant servers