[fr] follow #1918