Convert #623921 to Flügger