Convert #517367 to Flügger