Seems to address the proximal issue but perhaps leaves open use in a chaining attack?