Convert #721849 to Flügger