Convert #517897 to Flügger