Fix to data validation