Convert #715426 to Flügger