ShapeFilesWidget and Print legend

I am using FV3.1 and the shapefileswidget 3.1.3.

Everything seems to be working (loads large data sets much faster now with the 100 points at a time BTW) and adds the shapefile name/labels to the TOC/Legend.

However, when I print using the print task, each shapefile that I have added show up as Override 1. So, could have multiple Overrride 1's, with the proper symbology.

Was wondering if there is a way to get it to actually report the shapefile name in the print legend as it does in the TOC and Legend widget.

Thanks,

R_