Convert #517979 to Flügger