fixed fullData issue