Convert #548673 to Flügger