Do not loose already stored references

In case we have an object with several reference fields, already saved references could be lost, this avoid this...

Please review/comment/merge ;-)

Thank you!

Gauthier