Convert #226039 to Flügger