Convert #468828 to Flügger