Convert #332986 to Flügger