Convert #351340 to Flügger