Convert #226679 to Flügger