Convert #517447 to Flügger