Convert #517629 to Flügger