Convert #227537 to Flügger