Convert #517982 to Flügger