Convert #226839 to Flügger