Convert #226843 to Flügger