Convert #226931 to Flügger