Convert #629784 to Flügger