Convert #517577 to Flügger