Convert #227441 to Flügger