Bug fix for when using data file name.