Convert #344339 to Flügger