Convert #226639 to Flügger