Convert #409797 to Flügger