don't double store if using raw_value