Convert #347366 to Flügger