Convert #721639 to Flügger