Fix truncation again, via new info from RFC.