Convert #226642 to Flügger