Convert #628561 to Flügger