Convert #336529 to Flügger