Fixed another bug in data loading