Fix for lagging data file name