Convert #351035 to Flügger