Convert #629628 to Flügger