Fix data consistency