No data bug fixed