[fr] follow #2131 & #2128