Convert #629905 to Flügger