Convert #628406 to Flügger