Convert #346574 to Flügger