Convert #521785 to Flügger