Convert #629416 to Flügger