Fix for issue with duplicated datafile entries