Convert #628779 to Flügger