Convert #334635 to Flügger