Convert #352489 to Flügger