Convert #346979 to Flügger