Convert #736482 to Flügger