Convert #226587 to Flügger