Convert #623326 to Flügger