Convert #517478 to Flügger