Convert #419939 to Flügger