Convert #628097 to Flügger