Convert #721724 to Flügger