Jean-Philippe Lambert

Good catch, but no time for this until next week...

Quick try, before disappearing for a while. Untested, sorry.