Convert #797482 to Flügger