Convert #517396 to Flügger