Convert #516338 to Flügger