Convert #517639 to Flügger