Convert #517785 to Flügger