Convert #226027 to Flügger