CDB-453 refs avoid to call save twice