Forward bugfix from pdkim repo