Convert #516237 to Flügger