Convert #226674 to Flügger