second try at avoid new link when saving