Convert #628441 to Flügger