Convert #721839 to Flügger