fix perf issues with FF & TupleDictionary
Merge pull request #97 from englercj/ff-tuple-fix

fix perf issues with FF & TupleDictionary