Convert #354045 to Flügger