Fixed rfc2184 logic