Convert #521887 to Flügger