fix for updates from PR2 in x509