Convert #516797 to Flügger