Convert #628835 to Flügger