Convert #516387 to Flügger