Convert #628442 to Flügger