Convert #629957 to Flügger