Convert #831637 to Flügger