Convert #623754 to Flügger