[fr] follow fd5bbda