Convert #629359 to Flügger