Convert #332946 to Flügger