Convert #623484 to Flügger