Convert #336547 to Flügger