Convert #721954 to Flügger