Convert #389407 to Flügger