Convert #831597 to Flügger