Convert #387641 to Flügger