Convert #521787 to Flügger