Convert #641407 to Flügger