Convert #332907 to Flügger