Convert #623779 to Flügger