Added data correctness check