Convert #629649 to Flügger