Fix for possible inconsistency between the MC and raw OCDB