valid_until field fix
valid_until field fix