Convert #517338 to Flügger