Convert #226837 to Flügger