fixing bugs with data loader