[fr] Follow #1216 & #1217