Convert #228697 to Flügger