Convert #516829 to Flügger