Convert #622682 to Flügger