Convert #516535 to Flügger