Convert #834837 to Flügger