Convert #517945 to Flügger