Add #765 to History
Fix shadowed variable warning