Convert #226629 to Flügger