Convert #346497 to Flügger