Convert #336426 to Flügger