Convert #629429 to Flügger