Convert #517797 to Flügger