Convert #831577 to Flügger