Convert #516525 to Flügger