Fixed bug in dataload