This bug was introduced when fixing #2787, I would like to be sure I don't reintroduce a bug there now...