Convert #228609 to Flügger