Convert #516534 to Flügger