Fix 'values'