Convert #409867 to Flügger