Convert #109537 to Flügger