fixed data validation