Convert #520585 to Flügger