fixed data bug