data bug fixed