Convert #787633 to Flügger