Convert #226828 to Flügger