Convert #346388 to Flügger