[fr] Follow up #537 and d74caa18f19909aa5fc489d5f3b1dd548705f8d7