Fixes inconsistency of data location
Merge pull request #179 from reggieb/master

Fixes inconsistency of data location