Convert #341861 to Flügger