Convert #721827 to Flügger