FIX ConsistencyCheck