Convert #517355 to Flügger