Convert #731629 to Flügger