Convert #336468 to Flügger