Convert #516590 to Flügger