Convert #548797 to Flügger