Convert #409641 to Flügger