Convert #629607 to Flügger