Resolved (I think) a small problem with the fileLocator not handling duplicate files correctly.