Convert #226697 to Flügger