Convert #340585 to Flügger