Convert #517759 to Flügger