[fr] #2156, #1905