Convert #227338 to Flügger