Convert #517589 to Flügger