Convert #228624 to Flügger