Convert #517981 to Flügger