Convert #517524 to Flügger