Convert #516537 to Flügger