Convert #517047 to Flügger