Fix data reconciliation