Convert #628754 to Flügger