Convert #322609 to Flügger