Convert #336423 to Flügger