Convert #517848 to Flügger