On "Here again, something like the following should do the trick." : fix in 2fecb25c728b2230f0cfe7a764c0bba511cdec2f