Convert #347326 to Flügger