Convert #679937 to Flügger