Fixing issues with data fidelity