Fixed data validation