Convert #517614 to Flügger