It has been fixed in OpenPGP. Are you aware of any fix for S/MIME so far?