Commit patch based on one from John L. Allen to fix "forward name