Convert #336472 to Flügger