[fr] backport of correction detected in 3.x