Convert #226829 to Flügger