Convert #517857 to Flügger