Convert #346478 to Flügger