Convert #468438 to Flügger