Convert #517529 to Flügger