Convert #831629 to Flügger