Convert #351464 to Flügger