[fr] follows #1764 and #1767