Change to raw OCDB in case not yet set