BF: Fix DataFinder bug introduced in d985f677
Merge pull request #761 from moloney/bf-datafinder

BF: Fix DataFinder bug introduced in d985f677 (Test is TODO)