Convert #226238 to Flügger