lack of data bug fixed v2