Convert #346484 to Flügger