Changed for RFC 4120