Convert #227336 to Flügger