fixed no data errors