Convert #517646 to Flügger