Fixed No Data Issue