Convert #228769 to Flügger