Convert #226338 to Flügger