Convert #387987 to Flügger