Convert #517386 to Flügger