Convert #518537 to Flügger