Fix consistency checking