Convert #517329 to Flügger