Include a fix for the multiple data-descriptor case.