Convert #517670 to Flügger