Convert #516585 to Flügger