Convert #517459 to Flügger