Convert #623609 to Flügger