Convert #407674 to Flügger