Convert #226351 to Flügger