Convert #721939 to Flügger