Data load bug fixed