fixed data issue