Convert #517591 to Flügger