[fr] #2169 and #2170